diff --git a/akkoma/akkoma.patch b/akkoma/akkoma.patch
index c5b201f..e18fa13 100644
--- a/akkoma/akkoma.patch
+++ b/akkoma/akkoma.patch
@@ -207,14 +207,14 @@ index 000000000..82d7e78e4
 +end
 diff --git a/lib/mix/tasks/migrator/import/apps.ex b/lib/mix/tasks/migrator/import/apps.ex
 new file mode 100644
-index 000000000..9ff011900
+index 000000000..956d8af73
 --- /dev/null
 +++ b/lib/mix/tasks/migrator/import/apps.ex
 @@ -0,0 +1,31 @@
 +defmodule Mix.Tasks.Pleroma.Migrator.Import.Apps do
 +  use Mix.Task
 +  import Mix.Pleroma
-+  import Mix.Migrator
++  import Mix.Pleroma.Migrator
 +  alias Pleroma.Repo
 +  alias Pleroma.Web.OAuth.App
 +
@@ -244,14 +244,14 @@ index 000000000..9ff011900
 +end
 diff --git a/lib/mix/tasks/migrator/import/blocks.ex b/lib/mix/tasks/migrator/import/blocks.ex
 new file mode 100644
-index 000000000..9434e811b
+index 000000000..d0c11d409
 --- /dev/null
 +++ b/lib/mix/tasks/migrator/import/blocks.ex
 @@ -0,0 +1,36 @@
 +defmodule Mix.Tasks.Pleroma.Migrator.Import.Blocks do
 +  use Mix.Task
 +  import Mix.Pleroma
-+  import Mix.Migrator
++  import Mix.Pleroma.Migrator
 +  alias Pleroma.User
 +  alias Pleroma.UserRelationship
 +
@@ -286,14 +286,14 @@ index 000000000..9434e811b
 +end
 diff --git a/lib/mix/tasks/migrator/import/filters.ex b/lib/mix/tasks/migrator/import/filters.ex
 new file mode 100644
-index 000000000..bb69ce2a1
+index 000000000..a50bda632
 --- /dev/null
 +++ b/lib/mix/tasks/migrator/import/filters.ex
 @@ -0,0 +1,45 @@
 +defmodule Mix.Tasks.Pleroma.Migrator.Import.Filters do
 +  use Mix.Task
 +  import Mix.Pleroma
-+  import Mix.Migrator
++  import Mix.Pleroma.Migrator
 +  alias Pleroma.User
 +  alias Pleroma.Filter
 +  alias Pleroma.Repo
@@ -337,14 +337,14 @@ index 000000000..bb69ce2a1
 +end
 diff --git a/lib/mix/tasks/migrator/import/follows.ex b/lib/mix/tasks/migrator/import/follows.ex
 new file mode 100644
-index 000000000..1b78ad450
+index 000000000..62b2cdab5
 --- /dev/null
 +++ b/lib/mix/tasks/migrator/import/follows.ex
 @@ -0,0 +1,37 @@
 +defmodule Mix.Tasks.Pleroma.Migrator.Import.Follows do
 +  use Mix.Task
 +  import Mix.Pleroma
-+  import Mix.Migrator
++  import Mix.Pleroma.Migrator
 +  alias Pleroma.User
 +  alias Pleroma.FollowingRelationship
 +
@@ -380,14 +380,14 @@ index 000000000..1b78ad450
 +end
 diff --git a/lib/mix/tasks/migrator/import/likes.ex b/lib/mix/tasks/migrator/import/likes.ex
 new file mode 100644
-index 000000000..f0f214431
+index 000000000..935e05cde
 --- /dev/null
 +++ b/lib/mix/tasks/migrator/import/likes.ex
 @@ -0,0 +1,22 @@
 +defmodule Mix.Tasks.Pleroma.Migrator.Import.Likes do
 +  use Mix.Task
 +  import Mix.Pleroma
-+  import Mix.Migrator
++  import Mix.Pleroma.Migrator
 +
 +  @shortdoc "Import likes."
 +  def run(_) do
@@ -408,14 +408,14 @@ index 000000000..f0f214431
 +end
 diff --git a/lib/mix/tasks/migrator/import/lists.ex b/lib/mix/tasks/migrator/import/lists.ex
 new file mode 100644
-index 000000000..1ae01fc9e
+index 000000000..2bbea62ef
 --- /dev/null
 +++ b/lib/mix/tasks/migrator/import/lists.ex
 @@ -0,0 +1,44 @@
 +defmodule Mix.Tasks.Pleroma.Migrator.Import.Lists do
 +  use Mix.Task
 +  import Mix.Pleroma
-+  import Mix.Migrator
++  import Mix.Pleroma.Migrator
 +  alias Pleroma.User
 +  alias Pleroma.List
 +  alias Pleroma.Repo
@@ -458,14 +458,14 @@ index 000000000..1ae01fc9e
 +end
 diff --git a/lib/mix/tasks/migrator/import/mutes.ex b/lib/mix/tasks/migrator/import/mutes.ex
 new file mode 100644
-index 000000000..0b5fd8a07
+index 000000000..1b1e439e0
 --- /dev/null
 +++ b/lib/mix/tasks/migrator/import/mutes.ex
 @@ -0,0 +1,35 @@
 +defmodule Mix.Tasks.Pleroma.Migrator.Import.Mutes do
 +  use Mix.Task
 +  import Mix.Pleroma
-+  import Mix.Migrator
++  import Mix.Pleroma.Migrator
 +  alias Pleroma.User
 +  alias Pleroma.UserRelationship
 +
@@ -499,14 +499,14 @@ index 000000000..0b5fd8a07
 +end
 diff --git a/lib/mix/tasks/migrator/import/statuses.ex b/lib/mix/tasks/migrator/import/statuses.ex
 new file mode 100644
-index 000000000..ed15c0aa8
+index 000000000..e96aa2f3c
 --- /dev/null
 +++ b/lib/mix/tasks/migrator/import/statuses.ex
 @@ -0,0 +1,23 @@
 +defmodule Mix.Tasks.Pleroma.Migrator.Import.Statuses do
 +  use Mix.Task
 +  import Mix.Pleroma
-+  import Mix.Migrator
++  import Mix.Pleroma.Migrator
 +
 +  @shortdoc "Import statuses."
 +  def run(_) do
@@ -528,14 +528,14 @@ index 000000000..ed15c0aa8
 +end
 diff --git a/lib/mix/tasks/migrator/import/thread_mutes.ex b/lib/mix/tasks/migrator/import/thread_mutes.ex
 new file mode 100644
-index 000000000..9552abda7
+index 000000000..a75e3af84
 --- /dev/null
 +++ b/lib/mix/tasks/migrator/import/thread_mutes.ex
 @@ -0,0 +1,33 @@
 +defmodule Mix.Tasks.Pleroma.Migrator.Import.ThreadMutes do
 +  use Mix.Task
 +  import Mix.Pleroma
-+  import Mix.Migrator
++  import Mix.Pleroma.Migrator
 +  alias Pleroma.User
 +  alias Pleroma.ThreadMute
 +
@@ -567,14 +567,14 @@ index 000000000..9552abda7
 +end
 diff --git a/lib/mix/tasks/migrator/import/tokens.ex b/lib/mix/tasks/migrator/import/tokens.ex
 new file mode 100644
-index 000000000..4429898ff
+index 000000000..486d48a62
 --- /dev/null
 +++ b/lib/mix/tasks/migrator/import/tokens.ex
 @@ -0,0 +1,40 @@
 +defmodule Mix.Tasks.Pleroma.Migrator.Import.Tokens do
 +  use Mix.Task
 +  import Mix.Pleroma
-+  import Mix.Migrator
++  import Mix.Pleroma.Migrator
 +  alias Pleroma.Repo
 +  alias Pleroma.User
 +  alias Pleroma.Web.OAuth.App
@@ -613,14 +613,14 @@ index 000000000..4429898ff
 +end
 diff --git a/lib/mix/tasks/migrator/import/users.ex b/lib/mix/tasks/migrator/import/users.ex
 new file mode 100644
-index 000000000..361945041
+index 000000000..425cbc532
 --- /dev/null
 +++ b/lib/mix/tasks/migrator/import/users.ex
 @@ -0,0 +1,42 @@
 +defmodule Mix.Tasks.Pleroma.Migrator.Import.Users do
 +  use Mix.Task
 +  import Mix.Pleroma
-+  import Mix.Migrator
++  import Mix.Pleroma.Migrator
 +  alias Pleroma.User
 +  alias Pleroma.Repo
 +
@@ -661,14 +661,14 @@ index 000000000..361945041
 +end
 diff --git a/lib/mix/tasks/migrator/import/votes.ex b/lib/mix/tasks/migrator/import/votes.ex
 new file mode 100644
-index 000000000..843b492e4
+index 000000000..27c1a8c8a
 --- /dev/null
 +++ b/lib/mix/tasks/migrator/import/votes.ex
 @@ -0,0 +1,22 @@
 +defmodule Mix.Tasks.Pleroma.Migrator.Import.Votes do
 +  use Mix.Task
 +  import Mix.Pleroma
-+  import Mix.Migrator
++  import Mix.Pleroma.Migrator
 +
 +  @shortdoc "Import poll votes."
 +  def run(_) do