3 files changed, 6 insertions, 26 deletions
diff --git a/database/src/kv/sort/mod.rs b/database/src/kv/sort/mod.rs
index 403ba73..8b814cd 100644
--- a/database/src/kv/sort/mod.rs
+++ b/database/src/kv/sort/mod.rs
@@ -4,26 +4,6 @@
     Copyright (C) 2026 metamuffin <metamuffin.org>
 */
 
-use jellyobject::Path;
-
-use crate::{MultiBehaviour, Sort};
 
 pub mod none;
 pub mod value;
-
-#[derive(Hash, PartialEq, Eq)]
-pub enum SortKey {
-    None,
-    Value(Path, MultiBehaviour),
-    Text(Path),
-}
-
-impl Sort {
-    pub fn key(&self) -> SortKey {
-        match self {
-            Sort::None => SortKey::None,
-            Sort::Value(vs) => SortKey::Value(vs.path.clone(), vs.multi),
-            Sort::TextSearch(p, _) => SortKey::Text(p.to_owned()),
-        }
-    }
-}
diff --git a/database/src/kv/sort/none.rs b/database/src/kv/sort/none.rs
index b4d5db2..4044919 100644
--- a/database/src/kv/sort/none.rs
+++ b/database/src/kv/sort/none.rs
@@ -6,17 +6,17 @@
 
 use crate::{
     RowNum,
-    kv::{TableNum, binning::Binning},
+    kv::{SubtreeNum, binning::Binning},
 };
 use jellyobject::Object;
 
 pub struct UnsortedIndex {
-    id: TableNum,
+    id: SubtreeNum,
     binning: Binning,
 }
 
 impl UnsortedIndex {
-    pub fn new(id: TableNum, binning: Binning) -> Self {
+    pub fn new(id: SubtreeNum, binning: Binning) -> Self {
         Self { id, binning }
     }
     fn keys(&self, id: RowNum, ob: Object) -> Vec<Vec<u8>> {
diff --git a/database/src/kv/sort/value.rs b/database/src/kv/sort/value.rs
index 0d4ceb7..5637ac7 100644
--- a/database/src/kv/sort/value.rs
+++ b/database/src/kv/sort/value.rs
@@ -8,17 +8,17 @@ use jellyobject::Object;
 
 use crate::{
     MultiBehaviour, RowNum, ValueSort,
-    kv::{TableNum, binning::Binning},
+    kv::{SubtreeNum, binning::Binning},
 };
 
 pub struct ValueIndex {
-    id: TableNum,
+    id: SubtreeNum,
     binning: Binning,
     sort: ValueSort,
 }
 
 impl ValueIndex {
-    pub fn new(id: TableNum, binning: Binning, sort: ValueSort) -> Self {
+    pub fn new(id: SubtreeNum, binning: Binning, sort: ValueSort) -> Self {
         Self { id, binning, sort }
     }
     fn keys(&self, id: RowNum, ob: Object) -> Vec<Vec<u8>> {