diff --git a/pkgs/clan-cli/clan_cli/completions.py b/pkgs/clan-cli/clan_cli/completions.py
index 864e1a31e..127f8f2de 100644
--- a/pkgs/clan-cli/clan_cli/completions.py
+++ b/pkgs/clan-cli/clan_cli/completions.py
@@ -49,19 +49,10 @@ def complete_machines(
                 flake = clan_dir_result
             else:
                 flake = "."
-            services_result = json.loads(
-                run(
-                    nix_eval(
-                        flags=[
-                            f"{flake}#clanInternals.machines.x86_64-linux",
-                            "--apply",
-                            "builtins.attrNames",
-                        ],
-                    ),
-                ).stdout.strip()
-            )
 
-            machines.extend(services_result)
+            inventory = InventoryStore(Flake(str(flake))).read()
+            machines.extend(inventory.get("machines", {}).keys())
+
         except subprocess.CalledProcessError:
             pass
 
diff --git a/pkgs/clan-cli/clan_lib/flake/flake.py b/pkgs/clan-cli/clan_lib/flake/flake.py
index 46714e3a8..d8184e258 100644
--- a/pkgs/clan-cli/clan_lib/flake/flake.py
+++ b/pkgs/clan-cli/clan_lib/flake/flake.py
@@ -792,7 +792,6 @@ class Flake:
         if self.flake_cache_path:
             self._cache.save_to_file(self.flake_cache_path)
 
-
     def precache(
         self,
         selectors: list[str],