diff --git a/pkgs/clan-cli/clan_cli/clan_uri.py b/pkgs/clan-cli/clan_cli/clan_uri.py
index 3b68cf74..184f9c9f 100644
--- a/pkgs/clan-cli/clan_cli/clan_uri.py
+++ b/pkgs/clan-cli/clan_cli/clan_uri.py
@@ -116,10 +116,8 @@ class ClanURI:
     def get_full_uri(self) -> str:
         return self._full_uri
 
-    # TODO(@Qubasa): return a comparable id e.g. f"{url}#{attr}"
-    # This should be our standard.
     def get_id(self) -> str:
-        return f"{self._components.path}#{self._components.fragment}"
+        return f"{self.get_internal()}#{self.params.flake_attr}"
 
     @classmethod
     def from_path(
diff --git a/pkgs/clan-vm-manager/clan_vm_manager/views/list.py b/pkgs/clan-vm-manager/clan_vm_manager/views/list.py
index 552ef837..ddd411af 100644
--- a/pkgs/clan-vm-manager/clan_vm_manager/views/list.py
+++ b/pkgs/clan-vm-manager/clan_vm_manager/views/list.py
@@ -188,7 +188,8 @@ class ClanList(Gtk.Box):
         row.add_css_class("trust")
 
         # TODO: figure out how to detect that
-        if True:
+        exist = VMS.use().get_by_id(item.url.get_id())
+        if exist:
             row.set_subtitle("Clan already exists. Joining again will update it")
 
         avatar = Adw.Avatar()