diff --git a/lib/pleroma/search.ex b/lib/pleroma/search/database_search.ex
similarity index 68%
rename from lib/pleroma/search.ex
rename to lib/pleroma/search/database_search.ex
index e363abf19..be0e19be0 100644
--- a/lib/pleroma/search.ex
+++ b/lib/pleroma/search/database_search.ex
@@ -1,4 +1,4 @@
-defmodule Pleroma.Search do
+defmodule Pleroma.Search.DatabaseSearch do
   def add_to_index(activity) do
     search_module = Pleroma.Config.get([Pleroma.Search, :module])
 
@@ -15,4 +15,10 @@ defmodule Pleroma.Search do
       Task.start(fn -> search_module.remove_from_index(object) end)
     end)
   end
+
+  def search(query, options) do
+    search_module = Pleroma.Config.get([Pleroma.Search, :module], Pleroma.Activity)
+
+    search_module.search(options[:for_user], query, options)
+  end
 end
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index e6548a818..92b1be62c 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -141,7 +141,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
       end)
 
       # Add local posts to search index
-      if local, do: Pleroma.Search.add_to_index(activity)
+      if local, do: Pleroma.Search.DatabaseSearch.add_to_index(activity)
 
       {:ok, activity}
     else
diff --git a/lib/pleroma/web/activity_pub/side_effects.ex b/lib/pleroma/web/activity_pub/side_effects.ex
index 097afa30e..d08d6aa70 100644
--- a/lib/pleroma/web/activity_pub/side_effects.ex
+++ b/lib/pleroma/web/activity_pub/side_effects.ex
@@ -223,7 +223,7 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
         Task.start(fn -> Pleroma.Web.RichMedia.Helpers.fetch_data_for_activity(activity) end)
       end)
 
-      Pleroma.Search.add_to_index(Map.put(activity, :object, object))
+      Pleroma.Search.DatabaseSearch.add_to_index(Map.put(activity, :object, object))
 
       meta =
         meta
@@ -325,7 +325,7 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
     if result == :ok do
       Notification.create_notifications(object)
 
-      Pleroma.Search.remove_from_index(deleted_object)
+      Pleroma.Search.DatabaseSearch.remove_from_index(deleted_object)
 
       {:ok, object, meta}
     else
diff --git a/lib/pleroma/web/mastodon_api/controllers/search_controller.ex b/lib/pleroma/web/mastodon_api/controllers/search_controller.ex
index aaf52cdc5..05fa4144d 100644
--- a/lib/pleroma/web/mastodon_api/controllers/search_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/search_controller.ex
@@ -76,9 +76,7 @@ defmodule Pleroma.Web.MastodonAPI.SearchController do
   end
 
   defp resource_search(_, "statuses", query, options) do
-    search_module = Pleroma.Config.get([Pleroma.Search, :module], Pleroma.Activity)
-
-    statuses = with_fallback(fn -> search_module.search(options[:for_user], query, options) end)
+    statuses = with_fallback(fn -> Pleroma.Search.DatabaseSearch.search(query, options) end)
 
     StatusView.render("index.json",
       activities: statuses,