diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt
index 2f8151f9f..20a2ab1a7 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt
+++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt
@@ -61,7 +61,7 @@ import com.todoroo.astrid.adapter.TaskAdapter
 import com.todoroo.astrid.adapter.TaskAdapterProvider
 import com.todoroo.astrid.api.AstridApiConstants.EXTRAS_OLD_DUE_DATE
 import com.todoroo.astrid.api.AstridApiConstants.EXTRAS_TASK_ID
-import com.todoroo.astrid.api.CustomFilter
+import org.tasks.filters.CustomFilter
 import com.todoroo.astrid.dao.TaskDao
 import com.todoroo.astrid.repeats.RepeatTaskHelper
 import com.todoroo.astrid.service.TaskCompleter
diff --git a/app/src/main/java/org/tasks/activities/FilterSettingsActivity.kt b/app/src/main/java/org/tasks/activities/FilterSettingsActivity.kt
index 7e41427d4..a0ab73034 100644
--- a/app/src/main/java/org/tasks/activities/FilterSettingsActivity.kt
+++ b/app/src/main/java/org/tasks/activities/FilterSettingsActivity.kt
@@ -22,7 +22,7 @@ import org.tasks.data.sql.UnaryCriterion
 import com.todoroo.astrid.activity.MainActivity
 import com.todoroo.astrid.activity.TaskListFragment
 import com.todoroo.astrid.api.BooleanCriterion
-import com.todoroo.astrid.api.CustomFilter
+import org.tasks.filters.CustomFilter
 import com.todoroo.astrid.api.CustomFilterCriterion
 import com.todoroo.astrid.api.MultipleSelectCriterion
 import com.todoroo.astrid.api.PermaSql
diff --git a/app/src/main/java/org/tasks/activities/NavigationDrawerCustomization.kt b/app/src/main/java/org/tasks/activities/NavigationDrawerCustomization.kt
index 47fb9da02..fc166687b 100644
--- a/app/src/main/java/org/tasks/activities/NavigationDrawerCustomization.kt
+++ b/app/src/main/java/org/tasks/activities/NavigationDrawerCustomization.kt
@@ -19,7 +19,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.todoroo.astrid.adapter.FilterViewHolder
 import com.todoroo.astrid.adapter.NavigationDrawerAdapter
 import org.tasks.filters.CaldavFilter
-import com.todoroo.astrid.api.CustomFilter
+import org.tasks.filters.CustomFilter
 import org.tasks.filters.GtasksFilter
 import org.tasks.filters.TagFilter
 import dagger.hilt.android.AndroidEntryPoint
diff --git a/app/src/main/java/org/tasks/filters/FilterExtensions.kt b/app/src/main/java/org/tasks/filters/FilterExtensions.kt
index c7313428f..0b15db3f1 100644
--- a/app/src/main/java/org/tasks/filters/FilterExtensions.kt
+++ b/app/src/main/java/org/tasks/filters/FilterExtensions.kt
@@ -1,6 +1,5 @@
 package org.tasks.filters
 
-import com.todoroo.astrid.api.CustomFilter
 import org.tasks.billing.Inventory
 import org.tasks.themes.TasksIcons
 
diff --git a/app/src/main/java/org/tasks/filters/FilterProvider.kt b/app/src/main/java/org/tasks/filters/FilterProvider.kt
index ca744136a..cbf416f2c 100644
--- a/app/src/main/java/org/tasks/filters/FilterProvider.kt
+++ b/app/src/main/java/org/tasks/filters/FilterProvider.kt
@@ -1,7 +1,6 @@
 package org.tasks.filters
 
 import android.content.Context
-import com.todoroo.astrid.api.CustomFilter
 import com.todoroo.astrid.core.BuiltInFilterExposer
 import dagger.hilt.android.qualifiers.ApplicationContext
 import org.tasks.BuildConfig
diff --git a/app/src/main/java/org/tasks/preferences/DefaultFilterProvider.kt b/app/src/main/java/org/tasks/preferences/DefaultFilterProvider.kt
index 823c495a0..3dcd4bc2d 100644
--- a/app/src/main/java/org/tasks/preferences/DefaultFilterProvider.kt
+++ b/app/src/main/java/org/tasks/preferences/DefaultFilterProvider.kt
@@ -1,6 +1,6 @@
 package org.tasks.preferences
 
-import com.todoroo.astrid.api.CustomFilter
+import org.tasks.filters.CustomFilter
 import kotlinx.coroutines.runBlocking
 import org.tasks.R
 import org.tasks.Strings.isNullOrEmpty
diff --git a/app/src/main/java/com/todoroo/astrid/api/CustomFilter.kt b/kmp/src/commonMain/kotlin/org/tasks/filters/CustomFilter.kt
similarity index 83%
rename from app/src/main/java/com/todoroo/astrid/api/CustomFilter.kt
rename to kmp/src/commonMain/kotlin/org/tasks/filters/CustomFilter.kt
index 28b9298b0..3526f3207 100644
--- a/app/src/main/java/com/todoroo/astrid/api/CustomFilter.kt
+++ b/kmp/src/commonMain/kotlin/org/tasks/filters/CustomFilter.kt
@@ -1,11 +1,9 @@
-package com.todoroo.astrid.api
+package org.tasks.filters
 
-import kotlinx.parcelize.Parcelize
-import org.tasks.filters.Filter
-import org.tasks.filters.FilterListItem
+import org.tasks.CommonParcelize
 import org.tasks.themes.TasksIcons
 
-@Parcelize
+@CommonParcelize
 data class CustomFilter(
     val filter: org.tasks.data.entity.Filter,
 ) : Filter {