diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bd7979113..e8925a434 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -49,7 +49,6 @@ sgp = "0.9.17-1.9.0"
 spotless = "6.19.0"
 sqldelight = "2.0.0-rc02"
 telephoto = "1.0.0-alpha02"
-# https://github.com/Tickaroo/tikxml/issues/114
 tikxml = "0.8.15"
 xerial = "3.42.0.0"
 
diff --git a/libraries/gemoji/db/build.gradle.kts b/libraries/gemoji/db/build.gradle.kts
index 1ff6b3143..4359efeab 100644
--- a/libraries/gemoji/db/build.gradle.kts
+++ b/libraries/gemoji/db/build.gradle.kts
@@ -8,6 +8,8 @@ sqldelight {
   databases {
     create("GemojiDatabase") {
       packageName.set("dev.zacsweers.catchup.gemoji.db")
+      schemaOutputDirectory.set(layout.projectDirectory.dir("src/main/sqldelight/databases"))
+      migrationOutputDirectory.set(layout.projectDirectory.dir("src/main/sqldelight/migrations"))
     }
   }
 }
diff --git a/libraries/gemoji/db/src/main/sqldelight/databases/3.db b/libraries/gemoji/db/src/main/sqldelight/databases/3.db
new file mode 100644
index 000000000..3ca825b8a
Binary files /dev/null and b/libraries/gemoji/db/src/main/sqldelight/databases/3.db differ
diff --git a/libraries/gemoji/db/src/main/sqldelight/databases/4.db b/libraries/gemoji/db/src/main/sqldelight/databases/4.db
new file mode 100644
index 000000000..3ca825b8a
Binary files /dev/null and b/libraries/gemoji/db/src/main/sqldelight/databases/4.db differ
diff --git a/libraries/gemoji/db/src/main/sqldelight/dev/zacsweers/catchup/gemoji/db/gemoji.sq b/libraries/gemoji/db/src/main/sqldelight/dev/zacsweers/catchup/gemoji/db/gemoji.sq
new file mode 100644
index 000000000..530b36c21
--- /dev/null
+++ b/libraries/gemoji/db/src/main/sqldelight/dev/zacsweers/catchup/gemoji/db/gemoji.sq
@@ -0,0 +1,4 @@
+CREATE TABLE IF NOT EXISTS gemoji (alias TEXT NOT NULL, emoji TEXT, PRIMARY KEY(alias));
+
+getEmoji:
+SELECT emoji FROM gemoji WHERE alias = ?;
diff --git a/libraries/gemoji/db/src/main/sqldelight/migrations/1.sqm b/libraries/gemoji/db/src/main/sqldelight/migrations/3.sqm
similarity index 51%
rename from libraries/gemoji/db/src/main/sqldelight/migrations/1.sqm
rename to libraries/gemoji/db/src/main/sqldelight/migrations/3.sqm
index f0d347e18..918787e3c 100644
--- a/libraries/gemoji/db/src/main/sqldelight/migrations/1.sqm
+++ b/libraries/gemoji/db/src/main/sqldelight/migrations/3.sqm
@@ -1,2 +1,3 @@
 -- Never actually used but necessary for versioning
 DROP TABLE IF EXISTS gemoji;
+CREATE TABLE gemoji (alias TEXT NOT NULL, emoji TEXT, PRIMARY KEY(alias));
diff --git a/libraries/gemoji/generator/build.gradle.kts b/libraries/gemoji/generator/build.gradle.kts
index 4ff30b714..01535d048 100644
--- a/libraries/gemoji/generator/build.gradle.kts
+++ b/libraries/gemoji/generator/build.gradle.kts
@@ -2,12 +2,25 @@ plugins {
   kotlin("jvm")
   `application`
   alias(libs.plugins.moshix)
+  alias(libs.plugins.sqldelight)
 }
 
 application {
   mainClass.set("dev.zacsweers.catchup.gemoji.generator.MainKt")
 }
 
+sqldelight {
+  databases {
+    create("GemojiDatabase") {
+      // Must be set before dependencies
+      packageName.set("dev.zacsweers.catchup.gemoji.db.mutable")
+      dependency(projects.libraries.gemoji.db)
+      schemaOutputDirectory.set(layout.projectDirectory.dir("src/main/sqldelight/databases"))
+      migrationOutputDirectory.set(layout.projectDirectory.dir("src/main/sqldelight/migrations"))
+    }
+  }
+}
+
 dependencies {
   implementation(libs.clikt)
   implementation(libs.sqldelight.driver.jvm)
diff --git a/libraries/gemoji/generator/src/main/kotlin/dev/zacsweers/catchup/gemoji/generator/main.kt b/libraries/gemoji/generator/src/main/kotlin/dev/zacsweers/catchup/gemoji/generator/main.kt
index 0526aa491..a7832039a 100644
--- a/libraries/gemoji/generator/src/main/kotlin/dev/zacsweers/catchup/gemoji/generator/main.kt
+++ b/libraries/gemoji/generator/src/main/kotlin/dev/zacsweers/catchup/gemoji/generator/main.kt
@@ -8,7 +8,7 @@ import com.github.ajalt.clikt.parameters.types.file
 import com.squareup.moshi.JsonClass
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapter
-import dev.zacsweers.catchup.gemoji.db.GemojiDatabase
+import dev.zacsweers.catchup.gemoji.db.mutable.GemojiDatabase
 
 private class GemojiGenerator : CliktCommand() {
 
@@ -52,7 +52,7 @@ private class GemojiGenerator : CliktCommand() {
       gemojiCount++
       for (alias in aliases) {
         aliasCount++
-        db.gemojiQueries.insert(alias, emoji)
+        db.mutableGemojiQueries.insert(alias, emoji)
       }
     }
     echo("Inserted $aliasCount aliases for $gemojiCount gemojis")
diff --git a/libraries/gemoji/generator/src/main/sqldelight/databases/3.db b/libraries/gemoji/generator/src/main/sqldelight/databases/3.db
new file mode 100644
index 000000000..e69de29bb
diff --git a/libraries/gemoji/generator/src/main/sqldelight/databases/4.db b/libraries/gemoji/generator/src/main/sqldelight/databases/4.db
new file mode 100644
index 000000000..3ca825b8a
Binary files /dev/null and b/libraries/gemoji/generator/src/main/sqldelight/databases/4.db differ
diff --git a/libraries/gemoji/db/src/main/sqldelight/dev/zacsweers/catchup/gemoji/generator/gemoji.sq b/libraries/gemoji/generator/src/main/sqldelight/dev/zacsweers/catchup/gemoji/db/mutable/mutableGemoji.sq
similarity index 73%
rename from libraries/gemoji/db/src/main/sqldelight/dev/zacsweers/catchup/gemoji/generator/gemoji.sq
rename to libraries/gemoji/generator/src/main/sqldelight/dev/zacsweers/catchup/gemoji/db/mutable/mutableGemoji.sq
index b75fc2808..fe5ff22c6 100644
--- a/libraries/gemoji/db/src/main/sqldelight/dev/zacsweers/catchup/gemoji/generator/gemoji.sq
+++ b/libraries/gemoji/generator/src/main/sqldelight/dev/zacsweers/catchup/gemoji/db/mutable/mutableGemoji.sq
@@ -3,6 +3,3 @@ CREATE TABLE IF NOT EXISTS gemoji (alias TEXT NOT NULL, emoji TEXT, PRIMARY KEY(
 insert:
 INSERT INTO gemoji(alias, emoji)
 VALUES (?, ?);
-
-getEmoji:
-SELECT emoji FROM gemoji WHERE alias = ?;
diff --git a/libraries/gemoji/db/src/main/sqldelight/migrations/2.sqm b/libraries/gemoji/generator/src/main/sqldelight/migrations/4.sqm
similarity index 51%
rename from libraries/gemoji/db/src/main/sqldelight/migrations/2.sqm
rename to libraries/gemoji/generator/src/main/sqldelight/migrations/4.sqm
index f0d347e18..918787e3c 100644
--- a/libraries/gemoji/db/src/main/sqldelight/migrations/2.sqm
+++ b/libraries/gemoji/generator/src/main/sqldelight/migrations/4.sqm
@@ -1,2 +1,3 @@
 -- Never actually used but necessary for versioning
 DROP TABLE IF EXISTS gemoji;
+CREATE TABLE gemoji (alias TEXT NOT NULL, emoji TEXT, PRIMARY KEY(alias));