fix(users): Use project_id for HybridCloudForeignKey filter

src/sentry/users/models/user_option.py

@@ -59,7 +59,7 @@ def unset_value(self, user: User, project: Project, key: str) -> None:
         """
         This isn't implemented for user-organization scoped options yet, because it hasn't been needed.
         """
-        self.filter(user=user, project=project, key=key).delete()
+        self.filter(user=user, project_id=project.id, key=key).delete()
 
         if not hasattr(self, "_metadata"):
             return

tests/sentry/users/models/test_user_option.py

@@ -0,0 +1,16 @@
+from sentry.testutils.cases import TestCase
+from sentry.testutils.silo import control_silo_test
+from sentry.users.models.user_option import UserOption
+
+
+@control_silo_test
+class UserOptionManagerTest(TestCase):
+    def test_unset_value(self) -> None:
+        project = self.create_project()
+        UserOption.objects.set_value(self.user, "foo", "bar", project=project)
+        assert UserOption.objects.filter(user=self.user, project_id=project.id, key="foo").exists()
+
+        UserOption.objects.unset_value(self.user, project, "foo")
+        assert not UserOption.objects.filter(
+            user=self.user, project_id=project.id, key="foo"
+        ).exists()