diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix
index 3eecfbf..58038d3 100644
--- a/hosts/picard/default.nix
+++ b/hosts/picard/default.nix
@@ -97,7 +97,6 @@
       "ib-tws"
       "zoom"
       "pantalaimon"
-      "moonlight"
     ];
     extraGroups = [ "plugdev" ];
     backupPaths = [ ];
diff --git a/modules/wireguard-common/default.nix b/modules/wireguard-common/default.nix
index 6451aa5..e67cf81 100644
--- a/modules/wireguard-common/default.nix
+++ b/modules/wireguard-common/default.nix
@@ -1,5 +1,7 @@
 {
+  lib,
   config,
+  vpn,
   ...
 }:
 {
diff --git a/modules/wireguard-server/default.nix b/modules/wireguard-server/default.nix
index a02ccad..27c8a8a 100644
--- a/modules/wireguard-server/default.nix
+++ b/modules/wireguard-server/default.nix
@@ -9,7 +9,7 @@
 
   networking.nat.enable = true;
 
-  networking.firewall.allowedUDPPorts = [ config.networking.wireguard.interfaces.wg0.listenPort ];
+  networking.firewall.allowedUDPPorts = [ config.networking.wireguard.interfaces.wg0.listenPort ]; # FIXME move this to wireguard-server
 
   networking.wireguard.interfaces.wg0 = {
     ips = [ "${vpn.${config.networking.hostName}.ip}/24" ];