diff --git a/flake.nix b/flake.nix
index 29f3bbb1..f609aaa7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -140,7 +140,9 @@
           then hostConf.ip4
           else throw "Host ${name} has no ip4 or ip6 address";
     in {
-      overlay = import ./overlay;
+      overlay = import ./overlay {
+        inherit nixos-unstable;
+      };
 
       legacyPackages = lib.attrsets.mapAttrs
         (system: pkgs: pkgs.appendOverlays
@@ -576,12 +578,13 @@
             inputs.hydra.nixosModules.hydra
             ./hosts/hydra
             {
+              _module.args = {
+                inherit self;
+                inherit (inputs) hydra-ca;
+              };
               sops.defaultSopsFile = "${secrets}/hosts/hydra/secrets.yaml";
             }
           ];
-          specialArgs = {
-            hydra-ca = inputs.hydra-ca;
-          };
         };
 
         mucbot = nixosSystem' {
diff --git a/hosts/hydra/hydra.nix b/hosts/hydra/hydra.nix
index 521882e2..2b4d8cf7 100644
--- a/hosts/hydra/hydra.nix
+++ b/hosts/hydra/hydra.nix
@@ -1,4 +1,4 @@
-{ hostRegistry, hydra-ca, config, lib, pkgs, ... }:
+{ self, hostRegistry, hydra-ca, config, lib, pkgs, ... }:
 {
   containers = {
     hydra-ca = {
@@ -30,7 +30,7 @@
           '';
         };
 
-        nixpkgs.overlays = [ (import ../../overlay) ];
+        nixpkgs.overlays = [ self.overlay ];
 
         services = {
           hydra-dev = lib.recursiveUpdate config.services.hydra-dev {
diff --git a/overlay/default.nix b/overlay/default.nix
index a1e7314c..f159128a 100644
--- a/overlay/default.nix
+++ b/overlay/default.nix
@@ -1,3 +1,5 @@
+{ nixos-unstable }:
+
 final: prev:
 
 {
@@ -50,4 +52,14 @@ final: prev:
   readsb = prev.callPackage ./readsb.nix { };
 
   SimpleYggGen-CPP = prev.callPackage ./simpleygggen.nix { };
+
+  wander =
+    if prev ? wander
+    then builtins.trace "`wander` is now available on stable NixOS. Please remove from overlay!"
+      prev.wander
+    else prev.callPackage (nixos-unstable + "/pkgs/tools/admin/wander") {
+      lib = prev.lib // {
+        teams.c3d2.members = [];
+      };
+    };
 }