diff --git a/pkgs/clan-cli/clan_cli/config/machine.py b/pkgs/clan-cli/clan_cli/config/machine.py
index 068606324..8580a56be 100644
--- a/pkgs/clan-cli/clan_cli/config/machine.py
+++ b/pkgs/clan-cli/clan_cli/config/machine.py
@@ -6,7 +6,7 @@ from typing import Optional
 
 from fastapi import HTTPException
 
-from clan_cli.dirs import get_clan_flake_toplevel
+from clan_cli.dirs import get_clan_flake_toplevel, nixpkgs
 from clan_cli.machines.folders import machine_folder, machine_settings_file
 
 
@@ -40,7 +40,7 @@ def set_config_for_machine(machine_name: str, config: dict) -> None:
 def schema_for_machine(machine_name: str, flake: Optional[Path] = None) -> dict:
     if flake is None:
         flake = get_clan_flake_toplevel()
-    # use nix eval to lib.evalModules .#clanModules.machine-{machine_name}
+    # use nix eval to lib.evalModules .#nixosModules.machine-{machine_name}
     proc = subprocess.run(
         [
             "nix",
@@ -54,8 +54,8 @@ def schema_for_machine(machine_name: str, flake: Optional[Path] = None) -> dict:
             f"""
             let
                 flake = builtins.getFlake (toString {flake});
-                lib = flake.inputs.nixpkgs.lib;
-                module = builtins.trace (builtins.attrNames flake) flake.clanModules.machine-{machine_name};
+                lib = import {nixpkgs()}/lib;
+                module = builtins.trace (builtins.attrNames flake) flake.nixosModules.machine-{machine_name};
                 evaled = lib.evalModules {{
                     modules = [module];
                 }};
diff --git a/pkgs/clan-cli/tests/machine_flake/flake.nix b/pkgs/clan-cli/tests/machine_flake/flake.nix
index 8eefc68aa..32aebce29 100644
--- a/pkgs/clan-cli/tests/machine_flake/flake.nix
+++ b/pkgs/clan-cli/tests/machine_flake/flake.nix
@@ -5,6 +5,6 @@
   };
 
   outputs = _inputs: {
-    clanModules.machine-machine1 = ./clanModules/machine1.nix;
+    nixosModules.machine-machine1 = ./nixosModules/machine1.nix;
   };
 }
diff --git a/pkgs/clan-cli/tests/machine_flake/clanModules/machine1.nix b/pkgs/clan-cli/tests/machine_flake/nixosModules/machine1.nix
similarity index 100%
rename from pkgs/clan-cli/tests/machine_flake/clanModules/machine1.nix
rename to pkgs/clan-cli/tests/machine_flake/nixosModules/machine1.nix