diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml
index 57e8ef6e..b9a41202 100644
--- a/.forgejo/workflows/ci.yaml
+++ b/.forgejo/workflows/ci.yaml
@@ -31,7 +31,7 @@ jobs:
     runs-on: native
     steps:
       - uses: actions/checkout@v4
-      - run: nix build .#checks.x86_64-linux.deployment-basic -L
+      - run: cd deployment && nix-build -A tests
 
   check-infra:
     runs-on: native
diff --git a/deployment/check/basic/flake-part.nix b/deployment/check/basic/flake-part.nix
deleted file mode 100644
index aabf4705..00000000
--- a/deployment/check/basic/flake-part.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ inputs, ... }:
-
-{
-  nixops4Deployments.check-deployment-basic =
-    { ... }:
-    {
-      imports = [
-        ./deployment.nix
-      ];
-      _module.args.inputs = inputs;
-    };
-
-  perSystem =
-    { inputs', pkgs, ... }:
-    {
-      checks.deployment-basic = pkgs.callPackage ./nixosTest.nix {
-        nixops4-flake-in-a-bottle = inputs'.nixops4.packages.flake-in-a-bottle;
-        inherit inputs;
-      };
-    };
-}
diff --git a/deployment/check/basic/nixosTest.nix b/deployment/check/basic/nixosTest.nix
index 11e1de55..3cca3b31 100644
--- a/deployment/check/basic/nixosTest.nix
+++ b/deployment/check/basic/nixosTest.nix
@@ -1,8 +1,7 @@
 {
   testers,
   inputs,
-  runCommandNoCC,
-  nixops4-flake-in-a-bottle,
+  sources ? import ../npins,
   ...
 }:
 
@@ -14,11 +13,8 @@ testers.runNixOSTest (
     ...
   }:
   let
-    vmSystem = config.node.pkgs.hostPlatform.system;
-
     pathToRoot = ../../..;
     pathFromRoot = "deployment/check/basic";
-    deploymentName = "check-deployment-basic";
 
     ## TODO: sanity check the existence of (pathToRoot + "/flake.nix")
     ## TODO: sanity check that (pathToRoot + "/${pathFromRoot}" == ./.)
@@ -29,12 +25,6 @@ testers.runNixOSTest (
       root = pathToRoot;
     };
 
-    ## We will need to override some inputs by the empty flake, so we make one.
-    emptyFlake = runCommandNoCC "empty-flake" { } ''
-      mkdir $out
-      echo "{ outputs = { self }: {}; }" > $out/flake.nix
-    '';
-
     targetNetworkJSON = hostPkgs.writeText "target-network.json" (
       builtins.toJSON config.nodes.target.system.build.networkConfig
     );
@@ -42,17 +32,15 @@ testers.runNixOSTest (
   in
   {
     name = "deployment-basic";
-    imports = [
-      inputs.nixops4-nixos.modules.nixosTest.static
-    ];
+    # imports = [
+    # ];
 
     nodes = {
       deployer =
         { pkgs, nodes, ... }:
         {
-          environment.systemPackages = [
-            inputs.nixops4.packages.${vmSystem}.default
-          ];
+          # environment.systemPackages = [
+          # ];
 
           virtualisation = {
             ## Memory use is expected to be dominated by the NixOS evaluation,
@@ -70,11 +58,7 @@ testers.runNixOSTest (
 
           system.extraDependencies =
             [
-              "${inputs.flake-parts}"
-              "${inputs.flake-parts.inputs.nixpkgs-lib}"
-              "${inputs.nixops4}"
-              "${inputs.nixops4-nixos}"
-              "${inputs.nixpkgs}"
+              sources.nixpkgs
 
               pkgs.stdenv
               pkgs.stdenvNoCC
@@ -132,19 +116,7 @@ testers.runNixOSTest (
           cd work
           nix flake lock --extra-experimental-features 'flakes nix-command' \
             --offline -v \
-            --override-input flake-parts ${inputs.flake-parts} \
-            --override-input nixops4 ${nixops4-flake-in-a-bottle} \
-            \
-            --override-input nixops4-nixos ${inputs.nixops4-nixos} \
-            --override-input nixops4-nixos/flake-parts ${inputs.nixops4-nixos.inputs.flake-parts} \
-            --override-input nixops4-nixos/flake-parts/nixpkgs-lib ${inputs.nixops4-nixos.inputs.flake-parts.inputs.nixpkgs-lib} \
-            --override-input nixops4-nixos/nixops4-nixos ${emptyFlake} \
-            --override-input nixops4-nixos/nixpkgs ${inputs.nixops4-nixos.inputs.nixpkgs} \
-            --override-input nixops4-nixos/nixops4 ${nixops4-flake-in-a-bottle} \
-            --override-input nixops4-nixos/git-hooks-nix ${emptyFlake} \
-            \
             --override-input nixpkgs ${inputs.nixpkgs} \
-            --override-input git-hooks ${inputs.git-hooks} \
             ;
         """)
 
@@ -152,7 +124,7 @@ testers.runNixOSTest (
         target.fail("cowsay hi 1>&2")
 
       with subtest("Run the deployment"):
-        deployer.succeed("cd work && nixops4 apply ${deploymentName} --show-trace --no-interactive")
+        deployer.succeed("cd work && tofu apply --show-trace --no-interactive")
 
       with subtest("Check the deployment"):
         target.succeed("cowsay hi 1>&2")
diff --git a/deployment/default.nix b/deployment/default.nix
new file mode 100644
index 00000000..4bd84045
--- /dev/null
+++ b/deployment/default.nix
@@ -0,0 +1,12 @@
+{
+  system ? builtins.currentSystem,
+  sources ? import ../npins,
+  pkgs ? import sources.nixpkgs {
+    inherit system;
+  },
+}:
+{
+  tests = {
+    deployment-basic = import ./check/basic/nixosTest.nix { inherit pkgs; };
+  };
+}
diff --git a/deployment/flake-part.nix b/deployment/flake-part.nix
deleted file mode 100644
index 50030505..00000000
--- a/deployment/flake-part.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  imports = [ ./check/basic/flake-part.nix ];
-}
diff --git a/infra/sync-nix/.npins.json b/infra/sync-nix/.npins.json
deleted file mode 100644
index e679cf7e..00000000
--- a/infra/sync-nix/.npins.json
+++ /dev/null
@@ -1 +0,0 @@
-{"agenix":"/nix/store/glsqq1xn5al7d528hvlbm4hl3ladxmka-source","disko":"/nix/store/7wf9q0mb1i43x9dr1qlyfaraq15n6sii-source","flake-inputs":"/nix/store/fqln0bcp6mp75k4sl0cav2f0np60lwhj-source","git-hooks":"/nix/store/8bh3jgq1riy3jxm07vy4xxzvk9xd74pc-source","gitignore":"/nix/store/g5v3sgqy6a0fsmas7mnapc196flrplix-source","home-manager":"/nix/store/cq3b3cx5rv9d0zj57kch9wmxzc2rm8dc-source","htmx":"/nix/store/mwqqk0qmldzvv4xj9kq2lbah2flhc44z-source","nix-unit":"/nix/store/4g1vvy7bhwh16cyd2r8ibq7n6ygk1wvk-source","nixpkgs":"/nix/store/w0y3wsqi67rlg544myycqxcg2hh17j1v-source"}