diff --git a/modules/hylix.nix b/modules/hylix.nix
index e25988b..04866f6 100644
--- a/modules/hylix.nix
+++ b/modules/hylix.nix
@@ -1,9 +1,5 @@
-{inputs, ...}: let
-  lib = inputs.nixpkgs.lib.extend (_final: prev: {
-    self = import ../lib {lib = prev;};
-  });
-in {
+{inputs, ...}: {
   imports = [inputs.flake-parts.flakeModules.modules];
 
-  flake.lib = lib;
+  flake.lib = import ../lib {lib = inputs.nixpkgs.lib;};
 }
diff --git a/modules/hylix/animations.nix b/modules/hylix/animations.nix
index ed2f305..3ceac56 100644
--- a/modules/hylix/animations.nix
+++ b/modules/hylix/animations.nix
@@ -16,7 +16,7 @@ _: {
       # keep-sorted end
       ;
     inherit
-      (lib.self)
+      (import ../../lib {inherit lib;})
       # keep-sorted start
       mkHylixAnimationLines
       mkHylixCurveLines
diff --git a/modules/hylix/autostart.nix b/modules/hylix/autostart.nix
index d8d79a7..111fd2a 100644
--- a/modules/hylix/autostart.nix
+++ b/modules/hylix/autostart.nix
@@ -16,7 +16,7 @@ _: {
       # keep-sorted end
       ;
     inherit
-      (lib.self)
+      (import ../../lib {inherit lib;})
       # keep-sorted start
       ordering
       toLua
diff --git a/modules/hylix/binds.nix b/modules/hylix/binds.nix
index 4fccc1e..e12744b 100644
--- a/modules/hylix/binds.nix
+++ b/modules/hylix/binds.nix
@@ -16,7 +16,7 @@
       # keep-sorted end
       ;
     inherit
-      (lib.self)
+      (import ../../lib {inherit lib;})
       # keep-sorted start
       mkHylixBindLines
       mkHylixGroupedBinds
diff --git a/modules/hylix/devices.nix b/modules/hylix/devices.nix
index 023575c..d5dbdff 100644
--- a/modules/hylix/devices.nix
+++ b/modules/hylix/devices.nix
@@ -16,7 +16,7 @@ _: {
       # keep-sorted end
       ;
     inherit
-      (lib.self)
+      (import ../../lib {inherit lib;})
       # keep-sorted start
       ordering
       toLua
diff --git a/modules/hylix/env.nix b/modules/hylix/env.nix
index b1f99bb..8923c9b 100644
--- a/modules/hylix/env.nix
+++ b/modules/hylix/env.nix
@@ -16,7 +16,7 @@ _: {
       mkOrder
       # keep-sorted end
       ;
-    inherit (lib.self) ordering;
+    inherit (import ../../lib {inherit lib;}) ordering;
     inherit
       (lib.types)
       # keep-sorted start
diff --git a/modules/hylix/events.nix b/modules/hylix/events.nix
index 3f519a1..3336c2a 100644
--- a/modules/hylix/events.nix
+++ b/modules/hylix/events.nix
@@ -16,7 +16,7 @@ _: {
       # keep-sorted end
       ;
     inherit
-      (lib.self)
+      (import ../../lib {inherit lib;})
       # keep-sorted start
       ordering
       toLua
diff --git a/modules/hylix/extraLua.nix b/modules/hylix/extraLua.nix
index 42e349c..89a64c8 100644
--- a/modules/hylix/extraLua.nix
+++ b/modules/hylix/extraLua.nix
@@ -15,7 +15,7 @@ _: {
       mkOrder
       # keep-sorted end
       ;
-    inherit (lib.self) ordering;
+    inherit (import ../../lib {inherit lib;}) ordering;
     inherit
       (lib.types)
       # keep-sorted start
diff --git a/modules/hylix/gestures.nix b/modules/hylix/gestures.nix
index 5e54f8c..2507ff7 100644
--- a/modules/hylix/gestures.nix
+++ b/modules/hylix/gestures.nix
@@ -15,7 +15,7 @@ _: {
       mkOrder
       # keep-sorted end
       ;
-    inherit (lib.self) toLua ordering;
+    inherit (import ../../lib {inherit lib;}) toLua ordering;
     inherit
       (lib.types)
       # keep-sorted start
diff --git a/modules/hylix/monitors.nix b/modules/hylix/monitors.nix
index e872cd6..6661294 100644
--- a/modules/hylix/monitors.nix
+++ b/modules/hylix/monitors.nix
@@ -16,7 +16,7 @@ _: {
       # keep-sorted end
       ;
     inherit
-      (lib.self)
+      (import ../../lib {inherit lib;})
       # keep-sorted start
       mkHylixMonitorLine
       ordering
diff --git a/modules/hylix/notifications.nix b/modules/hylix/notifications.nix
index d92f8df..88860e8 100644
--- a/modules/hylix/notifications.nix
+++ b/modules/hylix/notifications.nix
@@ -16,7 +16,7 @@ _: {
       # keep-sorted end
       ;
     inherit
-      (lib.self)
+      (import ../../lib {inherit lib;})
       # keep-sorted start
       ordering
       toLua
diff --git a/modules/hylix/permissions.nix b/modules/hylix/permissions.nix
index 9231d68..596071a 100644
--- a/modules/hylix/permissions.nix
+++ b/modules/hylix/permissions.nix
@@ -15,7 +15,7 @@ _: {
       mkOrder
       # keep-sorted end
       ;
-    inherit (lib.self) toLua ordering;
+    inherit (import ../../lib {inherit lib;}) toLua ordering;
     inherit
       (lib.types)
       # keep-sorted start
diff --git a/modules/hylix/rules.nix b/modules/hylix/rules.nix
index 087b21c..9f23178 100644
--- a/modules/hylix/rules.nix
+++ b/modules/hylix/rules.nix
@@ -17,7 +17,7 @@ _: {
       # keep-sorted end
       ;
     inherit
-      (lib.self)
+      (import ../../lib {inherit lib;})
       # keep-sorted start
       mkHylixRuleLine
       ordering
diff --git a/modules/hylix/settings.nix b/modules/hylix/settings.nix
index 59c5b21..e494fb2 100644
--- a/modules/hylix/settings.nix
+++ b/modules/hylix/settings.nix
@@ -15,7 +15,7 @@ _: {
       # keep-sorted end
       ;
     inherit
-      (lib.self)
+      (import ../../lib {inherit lib;})
       # keep-sorted start
       ordering
       toLua