diff --git a/.github/workflows/test-nix.yml b/.github/workflows/test-nix.yml
index 659df13..a33419c 100644
--- a/.github/workflows/test-nix.yml
+++ b/.github/workflows/test-nix.yml
@@ -11,7 +11,7 @@ jobs:
   build-and-cache:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, macos-latest, macos-13]
 
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/flake.nix b/flake.nix
index 6492dcd..0da10f1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,7 +19,7 @@ rec {
       flake = {
         lib = rec {
           holochainDeps = { pkgs, lib }:
-            (with pkgs; [ perl openssl ])
+            (with pkgs; [ perl openssl go ])
             ++ (lib.optionals pkgs.stdenv.isLinux [ pkgs.pkg-config pkgs.go ])
             ++ (let
               apple_sdk = if pkgs.system == "x86_64-darwin" then
@@ -31,16 +31,6 @@ rec {
 
               apple_sdk.frameworks.AppKit
               apple_sdk.frameworks.WebKit
-
-              (apple_sdk.stdenv.mkDerivation {
-                name = "go";
-                nativeBuildInputs = with pkgs; [ makeBinaryWrapper go ];
-                dontBuild = true;
-                dontUnpack = true;
-                installPhase = ''
-                  makeWrapper ${pkgs.go}/bin/go $out/bin/go
-                '';
-              })
             ]));
 
           filterByHolochainPackageType = holochainPackageType: packages:
diff --git a/nix/fixtures/module-repo/Cargo.lock b/nix/fixtures/module-repo/Cargo.lock
index 0ef890b..8450a0e 100644
--- a/nix/fixtures/module-repo/Cargo.lock
+++ b/nix/fixtures/module-repo/Cargo.lock
@@ -2140,8 +2140,7 @@ dependencies = [
 [[package]]
 name = "hc_seed_bundle"
 version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "849aaef544dc9a561bcf1af4cbbc02e4cd24904b623aa1d0311f756fc2a96d38"
+source = "git+https://github.com/guillemcordoba/lair?branch=fix-sqlformat#1061a2e89f800c3416044936a3782923ec2a64df"
 dependencies = [
  "futures",
  "one_err",
@@ -3839,8 +3838,7 @@ dependencies = [
 [[package]]
 name = "lair_keystore"
 version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0da3e3e1bd2644dc2974ef622743cd83f2c661b3c6c67acb00cda4725646def"
+source = "git+https://github.com/guillemcordoba/lair?branch=fix-sqlformat#1061a2e89f800c3416044936a3782923ec2a64df"
 dependencies = [
  "lair_keystore_api",
  "pretty_assertions",
@@ -3855,8 +3853,7 @@ dependencies = [
 [[package]]
 name = "lair_keystore_api"
 version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9519a48df54d2041f8697bba7c3957263a5f2bb720ae6c4954004bad51693c61"
+source = "git+https://github.com/guillemcordoba/lair?branch=fix-sqlformat#1061a2e89f800c3416044936a3782923ec2a64df"
 dependencies = [
  "base64 0.22.1",
  "dunce",
diff --git a/nix/fixtures/module-repo/Cargo.toml b/nix/fixtures/module-repo/Cargo.toml
index 956b4bf..c736a53 100644
--- a/nix/fixtures/module-repo/Cargo.toml
+++ b/nix/fixtures/module-repo/Cargo.toml
@@ -9,3 +9,9 @@ holochain = "0.3.2"
 
 [profile.release]
 opt-level = "z"
+
+
+[patch.crates-io]
+# Revert to crates.io once https://github.com/holochain/lair/issues/133 is fixed 
+lair_keystore = { git = "https://github.com/guillemcordoba/lair", branch = "fix-sqlformat" }
+lair_keystore_api = { git = "https://github.com/guillemcordoba/lair", branch = "fix-sqlformat" }
diff --git a/nix/fixtures/module-repo/flake.lock b/nix/fixtures/module-repo/flake.lock
index dee112e..fba2d90 100644
--- a/nix/fixtures/module-repo/flake.lock
+++ b/nix/fixtures/module-repo/flake.lock
@@ -168,7 +168,7 @@
       },
       "locked": {
         "lastModified": 0,
-        "narHash": "sha256-tFfWo5Fdx2W9eqD2a/se1KaQYFZilpx2GxHrCENokKQ=",
+        "narHash": "sha256-3dD65UwuvI/gbUVY0DfV7/Dh+55K8j9+uvfJHc/1r8E=",
         "path": "./../../..",
         "type": "path"
       },