diff --git a/modules/blocks/hardcodedsecret.nix b/modules/blocks/hardcodedsecret.nix
index 95eb709..2c0ee84 100644
--- a/modules/blocks/hardcodedsecret.nix
+++ b/modules/blocks/hardcodedsecret.nix
@@ -2,7 +2,7 @@
 let
   cfg = config.shb.hardcodedsecret;
 
-  contracts = pkgs.callPackage ../contracts { inherit lib; };
+  contracts = pkgs.callPackage ../contracts {};
 
   inherit (lib) mapAttrs' mkOption nameValuePair;
   inherit (lib.types) attrsOf nullOr str submodule;
diff --git a/modules/contracts/default.nix b/modules/contracts/default.nix
index 889bcd6..2b22c10 100644
--- a/modules/contracts/default.nix
+++ b/modules/contracts/default.nix
@@ -47,12 +47,12 @@ in
 {
   databasebackup = importContract ./databasebackup.nix;
   backup = importContract ./backup.nix;
-  mount = import ./mount.nix { inherit lib; };
+  mount = pkgs.callPackage ./mount.nix {};
   secret = importContract ./secret.nix;
-  ssl = import ./ssl.nix { inherit lib; };
+  ssl = pkgs.callPackage ./ssl.nix {};
   test = {
-    secret = import ./secret/test.nix { inherit pkgs lib; };
-    databasebackup = import ./databasebackup/test.nix { inherit pkgs lib; };
-    backup = import ./backup/test.nix { inherit pkgs lib; };
+    secret = pkgs.callPackage ./secret/test.nix {};
+    databasebackup = pkgs.callPackage ./databasebackup/test.nix {};
+    backup = pkgs.callPackage ./backup/test.nix {};
   };
 }
diff --git a/test/contracts/backup.nix b/test/contracts/backup.nix
index 22b77e0..0370290 100644
--- a/test/contracts/backup.nix
+++ b/test/contracts/backup.nix
@@ -1,6 +1,6 @@
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
 let
-  contracts = pkgs.callPackage ../../modules/contracts { inherit lib; };
+  contracts = pkgs.callPackage ../../modules/contracts {};
 in
 {
   restic_root = contracts.test.backup {
diff --git a/test/contracts/databasebackup.nix b/test/contracts/databasebackup.nix
index 06faad0..aba1575 100644
--- a/test/contracts/databasebackup.nix
+++ b/test/contracts/databasebackup.nix
@@ -1,6 +1,6 @@
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
 let
-  contracts = pkgs.callPackage ../../modules/contracts { inherit lib; };
+  contracts = pkgs.callPackage ../../modules/contracts {};
 in
 {
   restic_postgres = contracts.test.databasebackup {
diff --git a/test/contracts/secret.nix b/test/contracts/secret.nix
index f19ed42..c594027 100644
--- a/test/contracts/secret.nix
+++ b/test/contracts/secret.nix
@@ -1,6 +1,6 @@
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
 let
-  contracts = pkgs.callPackage ../../modules/contracts { inherit lib; };
+  contracts = pkgs.callPackage ../../modules/contracts {};
 in
 {
   hardcoded_root_root = contracts.test.secret {