diff --git a/flake.lock b/flake.lock
index b5d9c7a04..502b18657 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,43 +1,43 @@
 {
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1666603677,
-        "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=",
+        "lastModified": 1672308958,
+        "narHash": "sha256-zLvAJ+XTI7gIlUqlrKj8j4+POZXDB6kUOnV0yBvSIMc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "074da18a72269cc5a6cf444dce42daea5649b2fe",
+        "rev": "d879125d61a0be8ecb2afddaca8f2b0530db0260",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
         "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "root": {
       "inputs": {
         "nixpkgs": "nixpkgs",
         "utils": "utils"
       }
     },
     "utils": {
       "locked": {
         "lastModified": 1638122382,
         "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
         "owner": "numtide",
         "repo": "flake-utils",
         "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
         "type": "github"
       },
       "original": {
         "owner": "numtide",
         "repo": "flake-utils",
         "type": "github"
       }
     }
   },
   "root": "root",
   "version": 7
 }
diff --git a/nix/overlay.nix b/nix/overlay.nix
index 7168e8815..ac837df18 100644
--- a/nix/overlay.nix
+++ b/nix/overlay.nix
@@ -1,100 +1,90 @@
 # An overlay allows for a package set to be extended with new or modified packages
 
 # `final` refers to the package set with all overlays applied.
 # This allows for added or modified packages to be referenced with
 # all relevant changes
 final:
 
 # `prev` refers to the previous package set before this current overlay is applied.
 # This is cheaper for nix to evaluate, thus should be prefered over final when possible.
 prev:
 
 {
   # Patch aws-sdk-cpp to automatically pick up header location
   # specific to nixpkgs, as nixpkgs separates build-time and runtime
   # depencenies (a saving of 400MB in header + generated files).
   # In the case of c and c++, this means the header files are
   # located in a separate directory from the libraries.
   #
   # From a developer perspective, this avoids having to manually specify
   # the header location with `-DAWS_CORE_HEADER_FILE` each time
   # one invokes `cmake` on the command line when using
   # `find_package(AWSSDK COMPONENTS [comps])`
   #
   # For more information, see:
   # - aws-sdk-cpp issue: https://github.com/aws/aws-sdk-cpp/issues/2009
   # - Nixpkgs fix: https://github.com/NixOS/nixpkgs/pull/182918
   aws-sdk-cpp = (prev.aws-sdk-cpp.overrideAttrs(oldAttrs:{
     postPatch = oldAttrs.postPatch + ''
       substituteInPlace cmake/AWSSDKConfig.cmake \
         --replace 'C:/AWSSDK/''${AWSSDK_INSTALL_INCLUDEDIR}/aws/core' \
           'C:/AWSSDK/''${AWSSDK_INSTALL_INCLUDEDIR}/aws/core"
           "${placeholder "dev"}/include/aws/core'
     '';
   })).override {
     # avoid rebuildilng all 300+ apis
     apis = [ "core" "s3" "dynamodb" ];
   };
 
   # add packages meant for just this repository
   amqp-cpp = prev.callPackage ./amqp-cpp.nix { };
 
   arcanist = prev.callPackage ./arcanist.nix { };
 
   better-prompt = prev.callPackage ./better-prompt.nix { };
 
   # c-ares is used to bootstrap curl, so cmake is not available in the default
   # build
   c-ares_cmake-config = prev.c-ares.overrideAttrs(o: {
     nativeBuildInputs = (o.nativeBuildInputs or []) ++ [ prev.cmake ];
   });
 
   comm-blob = final.callPackage ./blob.nix { };
 
   protobuf_3_15_cmake = prev.callPackage ./protobuf_3_15.nix { };
 
   devShells.default = final.callPackage ./dev-shell.nix { };
   devShell = final.devShells.default;
 
   localstack-down = prev.callPackage ./localstack-down.nix { };
 
   localstack-up = prev.callPackage ./localstack-up.nix { };
 
   # Make our version of mariadb the default everywhere
   mariadb = prev.mariadb_108;
 
   mariadb-up = prev.callPackage ./mariadb-up-mac.nix { };
 
   mysql-down = prev.callPackage ./mysql-down-linux.nix { };
 
   mysql-up = prev.callPackage ./mysql-up-linux.nix { };
 
   redis-up = prev.callPackage ./redis-up-mac.nix { };
 
   olm = prev.olm.overrideAttrs(oldAttrs: {
     # *.hh files aren't meant to be used externally
     # so we patch installation to add it
     postInstall = ''
       cp \
         $NIX_BUILD_TOP/${oldAttrs.src.name}/include/olm/*.h* \
         ''${!outputDev}/include/olm
     '';
   });
 
-  corrosion = prev.corrosion.overrideAttrs(_: {
-    patches = [
-      # Fix logic around finding cargo and rustc when not managed by rustup
-      (prev.fetchpatch {
-        url = "https://github.com/corrosion-rs/corrosion/commit/d5330b3f03c7abb4e4da71e35654fa03ecb778bb.patch";
-        sha256 = "sha256-jrA30bWNWprkqCiedf+xL7GlR9+9jgOyKAoTPVKkB9c=";
-      })
-    ];
-  });
-
   rabbitmq-up = prev.callPackage ./rabbitmq-up-mac.nix { };
 
   # Ensure that yarn is using the pinned version
   yarn = prev.yarn.override (_: {
     nodejs = final.nodejs-16_x-openssl_1_1;
   });
 }