diff --git a/pkgs/clan-cli/clan_cli/machines/morph.py b/pkgs/clan-cli/clan_cli/machines/morph.py
index 3e1e8e1ef..d820fb211 100644
--- a/pkgs/clan-cli/clan_cli/machines/morph.py
+++ b/pkgs/clan-cli/clan_cli/machines/morph.py
@@ -1,140 +1,14 @@
 import argparse
-import json
 import logging
-import os
-import random
-import re
-from pathlib import Path
-from tempfile import TemporaryDirectory
 
-from clan_lib.cmd import Log, RunOpts, run
-from clan_lib.dirs import get_clan_flake_toplevel_or_env, specific_machine_dir
+from clan_lib.dirs import get_clan_flake_toplevel_or_env
 from clan_lib.errors import ClanError
 from clan_lib.flake import Flake
-from clan_lib.machines.actions import list_machines
-from clan_lib.machines.machines import Machine
-from clan_lib.nix import nix_build, nix_command
-from clan_lib.nix_models.clan import InventoryMachine
-
-from clan_cli.machines.create import CreateOptions, create_machine
-from clan_cli.vars.generate import generate_vars
+from clan_lib.machines.morph import morph_machine
 
 log = logging.getLogger(__name__)
 
 
-def is_local_input(node: dict[str, dict[str, str]]) -> bool:
-    locked = node.get("locked")
-    if not locked:
-        return False
-    # matches path and git+file://
-    return (
-        locked["type"] == "path"
-        or re.match(r"^\w+\+file://", locked.get("url", "")) is not None
-    )
-
-
-def random_hostname() -> str:
-    adjectives = ["wacky", "happy", "fluffy", "silly", "quirky", "zany", "bouncy"]
-    nouns = ["unicorn", "penguin", "goose", "ninja", "octopus", "hamster", "robot"]
-    adjective = random.choice(adjectives)
-    noun = random.choice(nouns)
-    return f"{adjective}-{noun}"
-
-
-def morph_machine(
-    flake: Flake, template: str, ask_confirmation: bool, name: str | None = None
-) -> None:
-    cmd = nix_command(
-        [
-            "flake",
-            "archive",
-            "--json",
-            f"{flake}",
-        ]
-    )
-
-    archive_json = run(
-        cmd, RunOpts(error_msg="Failed to archive flake for morphing")
-    ).stdout.rstrip()
-    archive_path = json.loads(archive_json)["path"]
-
-    with TemporaryDirectory(prefix="morph-") as _temp_dir:
-        flakedir = Path(_temp_dir).resolve() / "flake"
-
-        flakedir.mkdir(parents=True, exist_ok=True)
-        run(["cp", "-r", archive_path + "/.", str(flakedir)])
-        run(["chmod", "-R", "+w", str(flakedir)])
-
-        os.chdir(flakedir)
-
-        if name is None:
-            name = random_hostname()
-
-        if name not in list_machines(flake):
-            create_opts = CreateOptions(
-                template=template,
-                machine=InventoryMachine(name=name),
-                clan_dir=Flake(str(flakedir)),
-            )
-            create_machine(create_opts, commit=False)
-
-        machine = Machine(name=name, flake=Flake(str(flakedir)))
-
-        generate_vars([machine], generator_name=None, regenerate=False)
-
-        machine.secret_vars_store.populate_dir(
-            output_dir=Path("/run/secrets"), phases=["activation", "users", "services"]
-        )
-
-        # run(["nixos-facter", "-o", f"{flakedir}/machines/{name}/facter.json"]).stdout
-
-        # facter_json = run(["nixos-facter"]).stdout
-        # run(["cp", "facter.json", f"{flakedir}/machines/{name}/facter.json"]).stdout
-
-        machine_dir = specific_machine_dir(machine)
-        machine_dir.mkdir(parents=True, exist_ok=True)
-        Path(f"{machine_dir}/facter.json").write_text('{"system": "x86_64-linux"}')
-        result_path = run(
-            nix_build(
-                [f"{flakedir}#nixosConfigurations.{name}.config.system.build.toplevel"]
-            )
-        ).stdout.rstrip()
-
-        ropts = RunOpts(log=Log.BOTH)
-
-        run(
-            [
-                f"{result_path}/sw/bin/nixos-rebuild",
-                "dry-activate",
-                "--flake",
-                f"{flakedir}#{name}",
-            ],
-            ropts,
-        ).stdout.rstrip()
-
-        if ask_confirmation:
-            log.warning("ARE YOU SURE YOU WANT TO DO THIS?")
-            log.warning(
-                "You should have read and understood all of the above and know what you are doing."
-            )
-
-            ask = input(
-                f"Do you really want convert this machine into {name}? If to continue, type in the new machine name: "
-            )
-            if ask != name:
-                return
-
-        run(
-            [
-                f"{result_path}/sw/bin/nixos-rebuild",
-                "test",
-                "--flake",
-                f"{flakedir}#{name}",
-            ],
-            ropts,
-        ).stdout.rstrip()
-
-
 def morph_command(args: argparse.Namespace) -> None:
     if args.flake:
         clan_dir = args.flake
diff --git a/pkgs/clan-cli/clan_lib/machines/morph.py b/pkgs/clan-cli/clan_lib/machines/morph.py
new file mode 100644
index 000000000..7855ee67d
--- /dev/null
+++ b/pkgs/clan-cli/clan_lib/machines/morph.py
@@ -0,0 +1,133 @@
+import json
+import logging
+import os
+import random
+import re
+from pathlib import Path
+from tempfile import TemporaryDirectory
+
+from clan_cli.machines.create import CreateOptions, create_machine
+from clan_cli.vars.generate import generate_vars
+
+from clan_lib.cmd import Log, RunOpts, run
+from clan_lib.dirs import specific_machine_dir
+from clan_lib.flake import Flake
+from clan_lib.machines.actions import list_machines
+from clan_lib.machines.machines import Machine
+from clan_lib.nix import nix_build, nix_command
+from clan_lib.nix_models.clan import InventoryMachine
+
+log = logging.getLogger(__name__)
+
+
+def is_local_input(node: dict[str, dict[str, str]]) -> bool:
+    locked = node.get("locked")
+    if not locked:
+        return False
+    # matches path and git+file://
+    return (
+        locked["type"] == "path"
+        or re.match(r"^\w+\+file://", locked.get("url", "")) is not None
+    )
+
+
+def random_hostname() -> str:
+    adjectives = ["wacky", "happy", "fluffy", "silly", "quirky", "zany", "bouncy"]
+    nouns = ["unicorn", "penguin", "goose", "ninja", "octopus", "hamster", "robot"]
+    adjective = random.choice(adjectives)
+    noun = random.choice(nouns)
+    return f"{adjective}-{noun}"
+
+
+def morph_machine(
+    flake: Flake, template: str, ask_confirmation: bool, name: str | None = None
+) -> None:
+    cmd = nix_command(
+        [
+            "flake",
+            "archive",
+            "--json",
+            f"{flake}",
+        ]
+    )
+
+    archive_json = run(
+        cmd, RunOpts(error_msg="Failed to archive flake for morphing")
+    ).stdout.rstrip()
+    archive_path = json.loads(archive_json)["path"]
+
+    with TemporaryDirectory(prefix="morph-") as _temp_dir:
+        flakedir = Path(_temp_dir).resolve() / "flake"
+
+        flakedir.mkdir(parents=True, exist_ok=True)
+        run(["cp", "-r", archive_path + "/.", str(flakedir)])
+        run(["chmod", "-R", "+w", str(flakedir)])
+
+        os.chdir(flakedir)
+
+        if name is None:
+            name = random_hostname()
+
+        if name not in list_machines(flake):
+            create_opts = CreateOptions(
+                template=template,
+                machine=InventoryMachine(name=name),
+                clan_dir=Flake(str(flakedir)),
+            )
+            create_machine(create_opts, commit=False)
+
+        machine = Machine(name=name, flake=Flake(str(flakedir)))
+
+        generate_vars([machine], generator_name=None, regenerate=False)
+
+        machine.secret_vars_store.populate_dir(
+            output_dir=Path("/run/secrets"), phases=["activation", "users", "services"]
+        )
+
+        # run(["nixos-facter", "-o", f"{flakedir}/machines/{name}/facter.json"]).stdout
+
+        # facter_json = run(["nixos-facter"]).stdout
+        # run(["cp", "facter.json", f"{flakedir}/machines/{name}/facter.json"]).stdout
+
+        machine_dir = specific_machine_dir(machine)
+        machine_dir.mkdir(parents=True, exist_ok=True)
+        Path(f"{machine_dir}/facter.json").write_text('{"system": "x86_64-linux"}')
+        result_path = run(
+            nix_build(
+                [f"{flakedir}#nixosConfigurations.{name}.config.system.build.toplevel"]
+            )
+        ).stdout.rstrip()
+
+        ropts = RunOpts(log=Log.BOTH)
+
+        run(
+            [
+                f"{result_path}/sw/bin/nixos-rebuild",
+                "dry-activate",
+                "--flake",
+                f"{flakedir}#{name}",
+            ],
+            ropts,
+        ).stdout.rstrip()
+
+        if ask_confirmation:
+            log.warning("ARE YOU SURE YOU WANT TO DO THIS?")
+            log.warning(
+                "You should have read and understood all of the above and know what you are doing."
+            )
+
+            ask = input(
+                f"Do you really want convert this machine into {name}? If to continue, type in the new machine name: "
+            )
+            if ask != name:
+                return
+
+        run(
+            [
+                f"{result_path}/sw/bin/nixos-rebuild",
+                "test",
+                "--flake",
+                f"{flakedir}#{name}",
+            ],
+            ropts,
+        ).stdout.rstrip()