diff --git a/flake.nix b/flake.nix
index 7710274..214c890 100644
--- a/flake.nix
+++ b/flake.nix
@@ -75,7 +75,6 @@
       systems = [ "x86_64-linux" ];
 
       imports = [
-        ./flake/checks.nix
         ./flake/dev-shells.nix
         ./flake/formatter.nix
         ./flake/hosts.nix
diff --git a/flake/checks.nix b/flake/checks.nix
deleted file mode 100644
index cfb89a7..0000000
--- a/flake/checks.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ inputs, self, ... }:
-{
-  perSystem =
-    { pkgs, ... }:
-    {
-      checks = {
-        # Ignore hosts.nix until https://github.com/oppiliappan/statix/issues/88 is resolved
-        statix = pkgs.runCommand "statix" { buildInputs = [ pkgs.statix ]; } ''
-          statix check --ignore ${self}/flake/hosts.nix ${self}
-          mkdir $out
-        '';
-
-        deadnix = pkgs.runCommand "deadnix" { buildInputs = [ pkgs.deadnix ]; } ''
-          deadnix --fail ${self}
-          mkdir $out
-        '';
-
-        flake-checker = pkgs.runCommand "flake-checker" { buildInputs = [ pkgs.flake-checker ]; } ''
-          flake-checker --fail-mode
-          mkdir $out
-        '';
-      };
-    };
-
-  flake.checks = builtins.mapAttrs (
-    _: deployLib: deployLib.deployChecks self.deploy
-  ) inputs.deploy-rs.lib;
-}
diff --git a/flake/hosts.nix b/flake/hosts.nix
index 96d75cb..1af1d19 100644
--- a/flake/hosts.nix
+++ b/flake/hosts.nix
@@ -54,5 +54,7 @@ in
       |> builtins.readDir
       |> lib.filterAttrs (_: type: type == "directory")
       |> lib.concatMapAttrs (name: _: mkDeployNode name);
+
+    checks = builtins.mapAttrs (_: deployLib: deployLib.deployChecks self.deploy) inputs.deploy-rs.lib;
   };
 }
diff --git a/justfile b/justfile
index 869e026..50b4500 100644
--- a/justfile
+++ b/justfile
@@ -14,7 +14,7 @@ fmt:
     nix fmt
 
 check:
-    nix flake check
+    nix flake check --no-build
 
 dev shell='default':
     nix develop .#{{ shell }} --command zsh