diff --git a/app/src/main/java/dev/msfjarvis/lobsters/data/remote/LobstersPagingSource.kt b/app/src/main/java/dev/msfjarvis/lobsters/data/remote/LobstersPagingSource.kt
index 8c814e19..77b48b65 100644
--- a/app/src/main/java/dev/msfjarvis/lobsters/data/remote/LobstersPagingSource.kt
+++ b/app/src/main/java/dev/msfjarvis/lobsters/data/remote/LobstersPagingSource.kt
@@ -2,7 +2,7 @@ package dev.msfjarvis.lobsters.data.remote
 
 import androidx.paging.PagingSource
 import dev.msfjarvis.lobsters.data.api.LobstersApi
-import dev.msfjarvis.lobsters.model.LobstersPost
+import dev.msfjarvis.lobsters.data.local.LobstersPost
 import javax.inject.Inject
 
 class LobstersPagingSource @Inject constructor(
diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/HottestPosts.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/HottestPosts.kt
index 042c7b36..9b3faf23 100644
--- a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/HottestPosts.kt
+++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/HottestPosts.kt
@@ -7,7 +7,7 @@ import androidx.compose.ui.Modifier
 import androidx.paging.LoadState
 import androidx.paging.compose.LazyPagingItems
 import androidx.paging.compose.items
-import dev.msfjarvis.lobsters.model.LobstersPost
+import dev.msfjarvis.lobsters.data.local.LobstersPost
 import dev.msfjarvis.lobsters.ui.urllauncher.AmbientUrlLauncher
 
 @Composable
@@ -30,8 +30,8 @@ fun HottestPosts(
         if (item != null) {
           LobstersItem(
             post = item,
-            onClick = { urlLauncher.launch(item.url.ifEmpty { item.commentsUrl }) },
-            onLongClick = { urlLauncher.launch(item.commentsUrl) },
+            onClick = { urlLauncher.launch(item.url.ifEmpty { item.comments_url }) },
+            onLongClick = { urlLauncher.launch(item.comments_url) },
             onSaveButtonClick = { saveAction.invoke(item) },
           )
         }
diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt
index 99a2d665..fb70012b 100644
--- a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt
+++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt
@@ -24,7 +24,7 @@ import coil.transform.CircleCropTransformation
 import dev.chrisbanes.accompanist.coil.CoilImage
 import dev.msfjarvis.lobsters.R
 import dev.msfjarvis.lobsters.data.api.LobstersApi
-import dev.msfjarvis.lobsters.model.LobstersPost
+import dev.msfjarvis.lobsters.data.local.LobstersPost
 import dev.msfjarvis.lobsters.model.Submitter
 import dev.msfjarvis.lobsters.ui.theme.LobstersTheme
 import dev.msfjarvis.lobsters.ui.theme.titleColor
@@ -55,6 +55,7 @@ val TEST_POST = LobstersPost(
     emptyList(),
   ),
   listOf("openbsd", "linux", "containers", "hack the planet", "no thanks"),
+  0,
 )
 
 @Composable
@@ -96,7 +97,7 @@ fun LobstersItem(
           .padding(vertical = 8.dp),
       )
       CoilImage(
-        data = "${LobstersApi.BASE_URL}/${post.submitterUser.avatarUrl}",
+        data = "${LobstersApi.BASE_URL}/${post.submitter_user.avatarUrl}",
         fadeIn = true,
         requestBuilder = {
           transformations(CircleCropTransformation())
@@ -110,7 +111,7 @@ fun LobstersItem(
           },
       )
       Text(
-        text = stringResource(id = R.string.submitted_by, post.submitterUser.username),
+        text = stringResource(id = R.string.submitted_by, post.submitter_user.username),
         modifier = Modifier
           .padding(4.dp)
           .constrainAs(submitter) {
diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/SavedPosts.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/SavedPosts.kt
index b30c3465..32a431e6 100644
--- a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/SavedPosts.kt
+++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/SavedPosts.kt
@@ -4,7 +4,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import dev.msfjarvis.lobsters.model.LobstersPost
+import dev.msfjarvis.lobsters.data.local.LobstersPost
 import dev.msfjarvis.lobsters.ui.urllauncher.AmbientUrlLauncher
 
 @Composable
@@ -26,8 +26,8 @@ fun SavedPosts(
       items(posts) { item ->
         LobstersItem(
           post = item,
-          onClick = { urlLauncher.launch(item.url.ifEmpty { item.commentsUrl }) },
-          onLongClick = { urlLauncher.launch(item.commentsUrl) },
+          onClick = { urlLauncher.launch(item.url.ifEmpty { item.comments_url }) },
+          onLongClick = { urlLauncher.launch(item.comments_url) },
           onSaveButtonClick = { saveAction.invoke(item) },
         )
       }
diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/viewmodel/LobstersViewModel.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/viewmodel/LobstersViewModel.kt
index 35e2eeaf..89f3c4be 100644
--- a/app/src/main/java/dev/msfjarvis/lobsters/ui/viewmodel/LobstersViewModel.kt
+++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/viewmodel/LobstersViewModel.kt
@@ -6,7 +6,7 @@ import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dev.msfjarvis.lobsters.data.remote.LobstersPagingSource
-import dev.msfjarvis.lobsters.model.LobstersPost
+import dev.msfjarvis.lobsters.data.local.LobstersPost
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
diff --git a/database/src/main/java/dev/msfjarvis/lobsters/model/LobstersPost.kt b/database/src/main/java/dev/msfjarvis/lobsters/model/LobstersPost.kt
deleted file mode 100644
index f6d947bd..00000000
--- a/database/src/main/java/dev/msfjarvis/lobsters/model/LobstersPost.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package dev.msfjarvis.lobsters.model
-
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-
-@JsonClass(generateAdapter = true)
-class LobstersPost(
-  @Json(name = "short_id")
-  val shortId: String,
-  @Json(name = "short_id_url")
-  val shortIdUrl: String,
-  @Json(name = "created_at")
-  val createdAt: String,
-  val title: String,
-  val url: String,
-  val score: Long,
-  val flags: Long,
-  @Json(name = "comment_count")
-  val commentCount: Long,
-  val description: String,
-  @Json(name = "comments_url")
-  val commentsUrl: String,
-  @Json(name = "submitter_user")
-  val submitterUser: Submitter,
-  val tags: List<String>,
-)