diff --git a/hardware/hosts/mediaserver.nix b/hardware/hosts/mediaserver.nix
index b0ae358..a656dc4 100644
--- a/hardware/hosts/mediaserver.nix
+++ b/hardware/hosts/mediaserver.nix
@@ -1,5 +1,8 @@
 { pkgs, modulesPath, ... }:
 
+let
+  latestKernelPackage = pkgs.linuxPackages_latest;
+in
 {
   imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
 
@@ -14,8 +17,9 @@
       kernelModules = [ "tls" ];
     };
 
-    kernelPackages = pkgs.linuxPackages_latest;
+    kernelPackages = latestKernelPackage;
     kernelModules = [ "kvm-intel" "tcp_bbr" ];
+    extraModulePackages = [ latestKernelPackage.wireguard ];
 
     kernel.sysctl = {
       "net.core.default_qdisc" = "fq";
diff --git a/system/hosts/mediaserver.nix b/system/hosts/mediaserver.nix
index 06c4c99..c4ab96b 100644
--- a/system/hosts/mediaserver.nix
+++ b/system/hosts/mediaserver.nix
@@ -13,8 +13,6 @@ in
 
     ../nixos/attic.nix
 
-    ../nixos/openvpn-mediaserver.nix
-
     ../nixos/tailscale.nix
   ];