diff --git a/flake.nix b/flake.nix
index e98c912..58314d2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -38,8 +38,8 @@
 
       nixosModules = {
         reposilite = import ./modules/reposilite.nix;
-        asus-numpad = import ./modules/asus-numpad.nix self;
-        shlink = import ./modules/shlink.nix self;
+        asus-numpad = lib.modules.importApply ./modules/asus-numpad.nix { inherit self; };
+        shlink = lib.modules.importApply ./modules/shlink.nix { inherit self; };
       };
 
       formatter = forEachSystem (system: (pkgsFor system).nixfmt-rfc-style);
diff --git a/modules/asus-numpad.nix b/modules/asus-numpad.nix
index 76c2577..e49863c 100644
--- a/modules/asus-numpad.nix
+++ b/modules/asus-numpad.nix
@@ -1,4 +1,4 @@
-self:
+{ self }:
 {
   lib,
   config,
diff --git a/modules/shlink.nix b/modules/shlink.nix
index 2945329..3823a7c 100644
--- a/modules/shlink.nix
+++ b/modules/shlink.nix
@@ -1,4 +1,4 @@
-self:
+{ self }:
 {
   lib,
   config,