diff --git a/nix/machines/hil-common.nix b/nix/machines/hil-common.nix
index 09822b6d..e9710500 100644
--- a/nix/machines/hil-common.nix
+++ b/nix/machines/hil-common.nix
@@ -108,6 +108,7 @@ in
     "${hostname}" = {
       enable = true;
       name = "${hostname}";
+      package = pkgs.unstable.github-runner;
       url = "https://github.com/worldcoin/orb-os";
       tokenFile = "/etc/worldcoin/secrets/gh-runner-token";
       extraLabels = [ "nixos" "flashing-hil" "${hostname}" ];
diff --git a/nix/packages/hil.nix b/nix/packages/hil.nix
index b7b38881..561b3b32 100644
--- a/nix/packages/hil.nix
+++ b/nix/packages/hil.nix
@@ -14,7 +14,6 @@
   cmake
   file
   gnumake
-  libiconv # see https://stackoverflow.com/a/69732679
   ninja
   zig
 ]
diff --git a/nix/shells/development.nix b/nix/shells/development.nix
index db6609e1..43b7ff2b 100644
--- a/nix/shells/development.nix
+++ b/nix/shells/development.nix
@@ -43,10 +43,7 @@ let
 in
 {
   # Everything in here becomes your shell (nix develop)
-  devShells.default = p.native.mkShell.override
-    {
-      stdenv = p.native.clangStdenv;
-    }
+  devShells.default = p.native.mkShell
     {
       # Nix makes the following list of dependencies available to the development
       # environment.
@@ -67,10 +64,6 @@ in
         zbus-xmlgen # Used by `orb-zbus-proxies`
         zig # Needed for cargo zigbuild
 
-        # This is missing on mac m1 nix, for some reason.
-        # see https://stackoverflow.com/a/69732679
-        libiconv
-
         # Used by various rust build scripts to find system libs
         # Note that this is the unwrapped version of pkg-config. By default,
         # nix wraps pkg-config with a script that replaces the PKG_CONFIG_PATH
@@ -83,6 +76,9 @@ in
         rustPlatform.bindgenHook # Configures bindgen to use nix clang
       ] ++ p.native.lib.lists.optionals p.native.stdenv.isDarwin [
         macFrameworks
+        # This is missing on mac m1 nix, for some reason.
+        # see https://stackoverflow.com/a/69732679
+        p.native.libiconv
       ];
 
       # The following sets up environment variables for the shell. These are used