diff --git a/modules/networking/wireguard/peers.nix b/modules/networking/wireguard/peers.nix
index 70336e3..8e4b576 100644
--- a/modules/networking/wireguard/peers.nix
+++ b/modules/networking/wireguard/peers.nix
@@ -27,7 +27,7 @@
   };
 
   forServer =
-    builtins.mapAttrs (_: v: {
+    lib.mapAttrsToList (_: v: {
       inherit (v) publicKey allowedIPs;
     })
     clients;
diff --git a/modules/networking/wireguard/server.nix b/modules/networking/wireguard/server.nix
index d6d24e4..23916d4 100644
--- a/modules/networking/wireguard/server.nix
+++ b/modules/networking/wireguard/server.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   cfg = config.hive.wg.server;
-  peers = import ./peers.nix {};
+  peers = import ./peers.nix {inherit lib;};
 in {
   options.hive.wg.server = {
     enable = lib.mkEnableOption "Enable WireGuard server";