5 files changed, 23 insertions, 20 deletions
diff --git a/repository/objects.go b/repository/objects.go
index 7f44e1d6..fd0be480 100644
--- a/repository/objects.go
+++ b/repository/objects.go
@@ -6,7 +6,7 @@ import (
 	"os"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/object/storer"
+	objectstorer "codeberg.org/lindenii/furgit/object/storer"
 	objectloose "codeberg.org/lindenii/furgit/object/storer/loose"
 	objectmix "codeberg.org/lindenii/furgit/object/storer/mix"
 	objectpacked "codeberg.org/lindenii/furgit/object/storer/packed"
diff --git a/repository/refs.go b/repository/refs.go
index 1337162b..5c085ef9 100644
--- a/repository/refs.go
+++ b/repository/refs.go
@@ -1,6 +1,6 @@
 package repository
 
-import "codeberg.org/lindenii/furgit/ref/store"
+import refstore "codeberg.org/lindenii/furgit/ref/store"
 
 // Refs returns the configured ref store.
 //
diff --git a/repository/repository.go b/repository/repository.go
index fabc52a8..6a24abdc 100644
--- a/repository/repository.go
+++ b/repository/repository.go
@@ -6,10 +6,10 @@ import (
 
 	"codeberg.org/lindenii/furgit/config"
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/object/storer"
+	objectstorer "codeberg.org/lindenii/furgit/object/storer"
 	objectloose "codeberg.org/lindenii/furgit/object/storer/loose"
 	objectpacked "codeberg.org/lindenii/furgit/object/storer/packed"
-	"codeberg.org/lindenii/furgit/ref/store"
+	refstore "codeberg.org/lindenii/furgit/ref/store"
 )
 
 // Repository is a thin composition root for repository-local stores.
diff --git a/repository/stored_test.go b/repository/stored_test.go
index f8eac6f0..3ebd9a76 100644
--- a/repository/stored_test.go
+++ b/repository/stored_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"codeberg.org/lindenii/furgit/internal/testgit"
-	"codeberg.org/lindenii/furgit/object"
 	objectid "codeberg.org/lindenii/furgit/object/id"
+	"codeberg.org/lindenii/furgit/object/tree"
 )
 
 func TestReadStoredTyped(t *testing.T) {
@@ -86,8 +86,8 @@ func TestResolverPath(t *testing.T) {
 			t.Fatalf("Path: %v", err)
 		}
 
-		if entry.Mode != object.FileModeRegular {
-			t.Fatalf("Path mode = %o, want %o", entry.Mode, object.FileModeRegular)
+		if entry.Mode != tree.FileModeRegular {
+			t.Fatalf("Path mode = %o, want %o", entry.Mode, tree.FileModeRegular)
 		}
 
 		if entry.ID != blobID {
@@ -169,8 +169,8 @@ func TestResolverPathDeepPath(t *testing.T) {
 			t.Fatalf("Path(deep): %v", err)
 		}
 
-		if entry.Mode != object.FileModeRegular {
-			t.Fatalf("Path(deep) mode = %o, want %o", entry.Mode, object.FileModeRegular)
+		if entry.Mode != tree.FileModeRegular {
+			t.Fatalf("Path(deep) mode = %o, want %o", entry.Mode, tree.FileModeRegular)
 		}
 
 		if entry.ID != leafBlobID {
@@ -212,11 +212,11 @@ func TestReadStoredTreeMixedModes(t *testing.T) {
 			t.Fatalf("ExactTree(root): %v", err)
 		}
 
-		expect := map[string]object.FileMode{
-			"normal.txt": object.FileModeRegular,
-			"run.sh":     object.FileModeExecutable,
-			"link.txt":   object.FileModeSymlink,
-			"dir":        object.FileModeDir,
+		expect := map[string]tree.FileMode{
+			"normal.txt": tree.FileModeRegular,
+			"run.sh":     tree.FileModeExecutable,
+			"link.txt":   tree.FileModeSymlink,
+			"dir":        tree.FileModeDir,
 		}
 
 		for name, wantMode := range expect {
diff --git a/repository/traversal_test.go b/repository/traversal_test.go
index 403ee788..29f0cc81 100644
--- a/repository/traversal_test.go
+++ b/repository/traversal_test.go
@@ -8,8 +8,11 @@ import (
 	"testing"
 
 	"codeberg.org/lindenii/furgit/internal/testgit"
-	"codeberg.org/lindenii/furgit/object"
+	"codeberg.org/lindenii/furgit/object/blob"
+	"codeberg.org/lindenii/furgit/object/commit"
 	objectid "codeberg.org/lindenii/furgit/object/id"
+	"codeberg.org/lindenii/furgit/object/tag"
+	"codeberg.org/lindenii/furgit/object/tree"
 	"codeberg.org/lindenii/furgit/repository"
 )
 
@@ -183,21 +186,21 @@ func traverseReachableIter(repo *repository.Repository, root objectid.ObjectID)
 		total++
 
 		switch obj := stored.Object().(type) {
-		case *object.Commit:
+		case *commit.Commit:
 			stack = append(stack, obj.Tree)
 			stack = append(stack, obj.Parents...)
-		case *object.Tree:
+		case *tree.Tree:
 			for i := len(obj.Entries) - 1; i >= 0; i-- {
 				entry := obj.Entries[i]
-				if entry.Mode == object.FileModeGitlink {
+				if entry.Mode == tree.FileModeGitlink {
 					continue
 				}
 
 				stack = append(stack, entry.ID)
 			}
-		case *object.Tag:
+		case *tag.Tag:
 			stack = append(stack, obj.Target)
-		case *object.Blob:
+		case *blob.Blob:
 		default:
 			// Unknown parsed object variants are treated as leaves.
 		}