diff --git a/biz/detail/build.gradle.kts b/biz/detail/build.gradle.kts
index f687f6a87..8aa6d98e3 100644
--- a/biz/detail/build.gradle.kts
+++ b/biz/detail/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
   alias(libs.plugins.android.library)
   alias(libs.plugins.kotlin.android)
-  alias(libs.plugins.moshiX)
+  alias(libs.plugins.ksp)
 }
 
 android {
@@ -17,4 +17,5 @@ dependencies {
   implementation(libs.bundles.accompanist)
 
   implementation(libs.square.moshi)
+  ksp(libs.square.moshi.compiler)
 }
diff --git a/biz/main/build.gradle.kts b/biz/main/build.gradle.kts
index 15ac66db0..52853f78e 100644
--- a/biz/main/build.gradle.kts
+++ b/biz/main/build.gradle.kts
@@ -3,7 +3,6 @@ plugins {
   alias(libs.plugins.kotlin.android)
   alias(libs.plugins.kotlin.kapt)
   alias(libs.plugins.ksp)
-  alias(libs.plugins.moshiX)
 }
 
 android {
@@ -25,4 +24,5 @@ dependencies {
   ksp(libs.androidX.room.compiler)
 
   implementation(libs.square.moshi)
+  ksp(libs.square.moshi.compiler)
 }
diff --git a/build.gradle.kts b/build.gradle.kts
index b78df6cd8..0355248ef 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,7 +12,6 @@ plugins {
   alias(libs.plugins.ksp) apply false
   alias(libs.plugins.kotlinter) apply false
   alias(libs.plugins.detekt) apply false
-  alias(libs.plugins.moshiX) apply false
 }
 
 allprojects {
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index 9b74914a1..2637e4ae3 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -3,7 +3,6 @@ plugins {
   alias(libs.plugins.kotlin.android)
   alias(libs.plugins.kotlin.kapt)
   alias(libs.plugins.ksp)
-  alias(libs.plugins.moshiX)
 }
 
 android {
@@ -35,7 +34,10 @@ dependencies {
   ksp(libs.androidX.room.compiler)
 
   implementation(libs.bundles.coil)
+
   implementation(libs.square.moshi)
+  ksp(libs.square.moshi.compiler)
+
   implementation(libs.square.retrofit.moshi)
 
   debugImplementation(libs.chucker.debug)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 33fb83060..b8590bf92 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -19,6 +19,7 @@ glide = "4.13.2"
 kotlin = "1.7.10"
 square-okHttp = "4.10.0"
 square-retrofit = "2.9.0"
+square-moshi = "1.14.0"
 srl = "2.0.5"
 support = "28.0.0"
 
@@ -28,7 +29,6 @@ android-library = { id = "com.android.library", version.ref = "agp" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
 ksp = "com.google.devtools.ksp:1.7.10-1.0.6"
-moshiX = "dev.zacsweers.moshix:0.18.3"
 kotlinter = "org.jmailen.kotlinter:3.12.0"
 detekt = "io.gitlab.arturbosch.detekt:1.21.0"
 
@@ -67,7 +67,8 @@ androidX-viewPager2 = "androidx.viewpager2:viewpager2:1.0.0"
 androidX-webKit = "androidx.webkit:webkit:1.5.0"
 
 square-leakCanary = "com.squareup.leakcanary:leakcanary-android:2.9.1"
-square-moshi = "com.squareup.moshi:moshi:1.14.0"
+square-moshi = { module = "com.squareup.moshi:moshi", version.ref = "square-moshi" }
+square-moshi-compiler = { module = "com.squareup.moshi:moshi-kotlin-codegen", version.ref = "square-moshi" }
 square-okHttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "square-okHttp" }
 square-okHttp-LogInterceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "square-okHttp" }
 square-okHttp-mock = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "square-okHttp" }