diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index f335e9972..a6d416b2c 100644
--- a/lib/pleroma/web/ostatus/ostatus.ex
+++ b/lib/pleroma/web/ostatus/ostatus.ex
@@ -195,7 +195,7 @@ defmodule Pleroma.Web.OStatus do
 
   def find_or_make_user(uri) do
     query = from user in User,
-      where: user.local == false and fragment("? @> ?", user.info, ^%{uri: uri})
+      where: user.ap_id == ^uri
 
     user = Repo.one(query)
 
diff --git a/test/web/ostatus/ostatus_test.exs b/test/web/ostatus/ostatus_test.exs
index a56e6c4e6..41e1c3448 100644
--- a/test/web/ostatus/ostatus_test.exs
+++ b/test/web/ostatus/ostatus_test.exs
@@ -140,8 +140,14 @@ defmodule Pleroma.Web.OStatusTest do
   end
 
   describe "new remote user creation" do
+    test "returns local users" do
+      local_user = insert(:user)
+      {:ok, user} = OStatus.find_or_make_user(local_user.ap_id)
+
+      assert user == local_user
+    end
+
     test "tries to use the information in poco fields" do
-      # TODO make test local
       uri = "https://social.heldscal.la/user/23211"
 
       {:ok, user} = OStatus.find_or_make_user(uri)
@@ -160,7 +166,6 @@ defmodule Pleroma.Web.OStatusTest do
     end
 
     test "find_make_or_update_user takes an author element and returns an updated user" do
-      # TODO make test local
       uri = "https://social.heldscal.la/user/23211"
 
       {:ok, user} = OStatus.find_or_make_user(uri)