diff --git a/modules/flake/checks/lib.nix b/modules/flake/checks/lib.nix
index 797984a3..6101673f 100644
--- a/modules/flake/checks/lib.nix
+++ b/modules/flake/checks/lib.nix
@@ -74,11 +74,7 @@
       # modified from
       # https://github.com/antifuchs/nix-flake-tests/blob/bbd9216bd0f6495bb961a8eb8392b7ef55c67afb/default.nix
       formatValue =
-        val:
-        if (builtins.isList val || builtins.isAttrs val) then
-          builtins.toJSON val
-        else
-          builtins.toString val;
+        val: if (builtins.isList val || builtins.isAttrs val) then builtins.toJSON val else toString val;
 
       resultToString =
         {
@@ -107,7 +103,7 @@
     {
       checks.lib =
         if res != [ ] then
-          builtins.throw (lib.strings.concatStringsSep "\n" (map resultToString (lib.debug.traceValSeq res)))
+          throw (lib.strings.concatStringsSep "\n" (map resultToString (lib.debug.traceValSeq res)))
         else
           pkgs.runCommandLocal "nix-flake-tests-success" { } "echo > $out";
     };
diff --git a/modules/flake/lib/helpers.nix b/modules/flake/lib/helpers.nix
index 710a4f1c..cc363b13 100644
--- a/modules/flake/lib/helpers.nix
+++ b/modules/flake/lib/helpers.nix
@@ -217,10 +217,10 @@ let
     {
       "https://${domain}/".insteadOf = "${alias}:";
       "ssh://${user}@${domain}${
-        if (builtins.isNull port) then
+        if (port == null) then
           ""
         else if (builtins.isInt port) then
-          ":" + (builtins.toString port)
+          ":" + (toString port)
         else
           ":" + port
       }/".pushInsteadOf =
diff --git a/modules/flake/lib/secrets.nix b/modules/flake/lib/secrets.nix
index 46dd09fd..79960a43 100644
--- a/modules/flake/lib/secrets.nix
+++ b/modules/flake/lib/secrets.nix
@@ -39,7 +39,7 @@ let
       ...
     }@args:
     let
-      args' = builtins.removeAttrs args [
+      args' = removeAttrs args [
         "file"
         "owner"
         "group"