diff --git a/core/data/impl/src/test/kotlin/voice/core/data/repo/internals/TestGraph.kt b/core/data/impl/src/test/kotlin/voice/core/data/repo/internals/TestGraph.kt
index 3b14ec947c..734f7f6c29 100644
--- a/core/data/impl/src/test/kotlin/voice/core/data/repo/internals/TestGraph.kt
+++ b/core/data/impl/src/test/kotlin/voice/core/data/repo/internals/TestGraph.kt
@@ -1,15 +1,10 @@
 package voice.core.data.repo.internals
 
-import android.content.Context
-import androidx.datastore.core.DataStore
 import androidx.room.migration.Migration
-import androidx.test.core.app.ApplicationProvider
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.DependencyGraph
-import dev.zacsweers.metro.Provides
 import dev.zacsweers.metro.SingleIn
-import dev.zacsweers.metro.createGraphFactory
-import voice.core.data.store.DarkThemeStore
+import dev.zacsweers.metro.createGraph
 
 @SingleIn(AppScope::class)
 @DependencyGraph(
@@ -18,25 +13,8 @@ import voice.core.data.store.DarkThemeStore
 internal interface TestGraph {
 
   val migrations: Set<@JvmSuppressWildcards Migration>
-
-  @DependencyGraph.Factory
-  interface Factory {
-
-    fun create(
-      @Provides
-      @DarkThemeStore
-      darkThemeStore: DataStore<Boolean>,
-      @Provides
-      context: Context,
-    ): TestGraph
-  }
 }
 
 internal fun allMigrations(): Array<Migration> {
-  return createGraphFactory<TestGraph.Factory>()
-    .create(
-      darkThemeStore = MemoryDataStore(false),
-      context = ApplicationProvider.getApplicationContext(),
-    )
-    .migrations.toTypedArray()
+  return createGraph<TestGraph>().migrations.toTypedArray()
 }
diff --git a/core/playback/src/main/kotlin/voice/core/playback/di/PlaybackScope.kt b/core/playback/src/main/kotlin/voice/core/playback/di/PlaybackScope.kt
index fdfa1d73ff..e0525c309b 100644
--- a/core/playback/src/main/kotlin/voice/core/playback/di/PlaybackScope.kt
+++ b/core/playback/src/main/kotlin/voice/core/playback/di/PlaybackScope.kt
@@ -1,6 +1,3 @@
 package voice.core.playback.di
 
-import dev.zacsweers.metro.Scope
-
-@Scope
 annotation class PlaybackScope
diff --git a/features/bookOverview/src/main/kotlin/voice/features/bookOverview/di/BookOverviewGraph.kt b/features/bookOverview/src/main/kotlin/voice/features/bookOverview/di/BookOverviewGraph.kt
index 526421ab29..6c0c2badc9 100644
--- a/features/bookOverview/src/main/kotlin/voice/features/bookOverview/di/BookOverviewGraph.kt
+++ b/features/bookOverview/src/main/kotlin/voice/features/bookOverview/di/BookOverviewGraph.kt
@@ -3,14 +3,12 @@ package voice.features.bookOverview.di
 import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.ContributesTo
 import dev.zacsweers.metro.GraphExtension
-import dev.zacsweers.metro.Scope
 import voice.features.bookOverview.bottomSheet.BottomSheetViewModel
 import voice.features.bookOverview.deleteBook.DeleteBookViewModel
 import voice.features.bookOverview.editTitle.EditBookTitleViewModel
 import voice.features.bookOverview.fileCover.FileCoverViewModel
 import voice.features.bookOverview.overview.BookOverviewViewModel
 
-@Scope
 annotation class BookOverviewScope
 
 @GraphExtension(scope = BookOverviewScope::class)
diff --git a/features/bookmark/src/main/kotlin/voice/features/bookmark/BookmarkViewModel.kt b/features/bookmark/src/main/kotlin/voice/features/bookmark/BookmarkViewModel.kt
index 77749a379c..6fe312e618 100644
--- a/features/bookmark/src/main/kotlin/voice/features/bookmark/BookmarkViewModel.kt
+++ b/features/bookmark/src/main/kotlin/voice/features/bookmark/BookmarkViewModel.kt
@@ -178,6 +178,6 @@ class BookmarkViewModel(
 
   @AssistedFactory
   interface Factory {
-    fun create(id: BookId): BookmarkViewModel
+    fun create(bookId: BookId): BookmarkViewModel
   }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index df9650e56a..d9d2134acf 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ agp = "9.0.1"
 ktlint-core = "1.8.0"
 ktlint-gradlePlugin = "0.13.0"
 retrofit = "3.0.0"
-metro = "0.10.3"
+metro = "0.11.1"
 navigation3 = "1.0.1"
 
 [libraries]
@@ -144,6 +144,6 @@ googleServices = { id = "com.google.gms.google-services", version = "4.4.4" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-ksp = { id = "com.google.devtools.ksp", version = "2.3.5" }
+ksp = { id = "com.google.devtools.ksp", version = "2.3.6" }
 ktlint = { id = "io.github.usefulness.ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
 metro = { id = "dev.zacsweers.metro", version.ref = "metro" }