diff --git a/flake.nix b/flake.nix
index d1633ad..81e3767 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,5 +3,7 @@
 
   outputs = { self, ... }: {
     overlay = import ./overlay.nix;
+
+    lib = import ./lib.nix;
   };
 }
diff --git a/lib.nix b/lib.nix
new file mode 100644
index 0000000..3480596
--- /dev/null
+++ b/lib.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+
+{
+  ip = import ./lib/ip.nix { inherit pkgs; };
+  dns = import ./lib/dns.nix { inherit pkgs; };
+  passwd = import ./lib/passwd.nix { inherit pkgs; };
+  lisp = import ./lib/lisp.nix { inherit pkgs; };
+  network = import ./lib/network.nix { inherit pkgs; };
+  fs = import ./lib/filesystem.nix { inherit pkgs; };
+}
diff --git a/lib/filesystem.nix b/lib/filesystem.nix
index b330564..4009918 100644
--- a/lib/filesystem.nix
+++ b/lib/filesystem.nix
@@ -26,7 +26,7 @@ let
 
   import-by-basename = path:
     mapAttrs (attr: attr-file: import attr-file)
-      (basename-to-file path);
+      (basename-to-file-map path);
 in {
   inherit basename-to-file-map import-by-basename;
 }