diff --git a/flake.lock b/flake.lock
index b3bf013b37370701ab8c274406a577affa9658f9..3cd0bbded9c62432f7fa82c84e2b80f2d0e80803 100644
--- a/flake.lock
+++ b/flake.lock
@@ -85,17 +85,16 @@
     "cardano-base": {
       "flake": false,
       "locked": {
-        "lastModified": 1646222518,
-        "narHash": "sha256-jrSDD2fXgHf4wo5THzfK/6tolvt8y9rNuJWYfBooqaQ=",
+        "lastModified": 1664966805,
+        "narHash": "sha256-raPy7vCleco/6mARMOeUraq7SQO1YOV5zOn4iqEyxWI=",
         "owner": "input-output-hk",
         "repo": "cardano-base",
-        "rev": "1587462ac8b2e50af2691f5ad93d3c2aa4674ed1",
+        "rev": "46cd4c97cff9f1f0a0da976aa9e32bd2899c85ee",
         "type": "github"
       },
       "original": {
         "owner": "input-output-hk",
         "repo": "cardano-base",
-        "rev": "1587462ac8b2e50af2691f5ad93d3c2aa4674ed1",
         "type": "github"
       }
     },
@@ -119,11 +118,11 @@
     "cardano-prelude": {
       "flake": false,
       "locked": {
-        "lastModified": 1657171052,
-        "narHash": "sha256-T5hW85PfnuR6066jIhH/2g5dzTmI0JXsXSKwez8fXnw=",
+        "lastModified": 1664548869,
+        "narHash": "sha256-7YOyIYKuslh8yD8ZAPuOiDaON7IoWVfkFKHOrjLtUK8=",
         "owner": "input-output-hk",
         "repo": "cardano-prelude",
-        "rev": "533aec85c1ca05c7d171da44b89341fb736ecfe5",
+        "rev": "b6053a23f53acd5c519cc559c3861dda3ebf8b35",
         "type": "github"
       },
       "original": {
@@ -640,16 +639,16 @@
     "plutus": {
       "flake": false,
       "locked": {
-        "lastModified": 1662314418,
-        "narHash": "sha256-Zd87e5gNVcnRk/2lXG5slEejI3HRWTenYnjIndkRICg=",
-        "owner": "locallycompact",
+        "lastModified": 1665072514,
+        "narHash": "sha256-o613DcnvD/uvwUo3c7KV4N3CrG0k+ndu/3lLcxfG/18=",
+        "owner": "milloni",
         "repo": "plutus",
-        "rev": "10140d8cc4c813ca5ec4f5397271f7bee0e4b2da",
+        "rev": "81cd1ada745c12af2c2c28afce1f6b6b28b38fdd",
         "type": "github"
       },
       "original": {
-        "owner": "locallycompact",
-        "ref": "ghc-942",
+        "owner": "milloni",
+        "ref": "milloni/ghc942",
         "repo": "plutus",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index efee8cba1507237dd90096767b94f50fb3c233b4..fbdf92f9cb586c51b8263fa6ec226a24195e4185 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
       flake = false;
     };
     cardano-base = {
-      url = "github:input-output-hk/cardano-base/1587462ac8b2e50af2691f5ad93d3c2aa4674ed1";
+      url = "github:input-output-hk/cardano-base";
       flake = false;
     };
     cardano-crypto = {
@@ -38,7 +38,7 @@
       flake = false;
     };
     plutus = {
-      url = "github:locallycompact/plutus?ref=ghc-942";
+      url = "github:milloni/plutus?ref=milloni/ghc942";
       flake = false;
     };
   };
diff --git a/overlay.nix b/overlay.nix
index 20370ccf4ce34438b5c3578f04dae92b3954169e..c913813fc3ee2a4b7868cbbf91f04b16500d1ff3 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -6,13 +6,15 @@ final: prev: with pkgs.haskell.lib;
 
   PyF = prev.callHackage "PyF" "0.11.0.0" { };
 
+  algebraic-graphs = prev.callHackage "algebraic-graphs" "0.7" {};
+
   bin = doJailbreak prev.bin;
 
   base16 = doJailbreak (dontCheck prev.base16);
 
   bech32 = dontCheck (prev.callHackage "bech32" "1.1.2" { });
 
-  canonical-json = dontCheck (doJailbreak (prev.callHackage "canonical-json" "0.6.0.0" {}));
+  canonical-json = dontCheck (doJailbreak (prev.callHackage "canonical-json" "0.6.0.1" {}));
 
   cardano-binary = doDevbreak (prev.callCabal2nix "cardano-binary" (inputs.cardano-base + /binary) {});
 
@@ -24,13 +26,15 @@ final: prev: with pkgs.haskell.lib;
 
   cardano-prelude = enableCabalFlag (doJailbreak (prev.callCabal2nix "cardano-prelude" (inputs.cardano-prelude + /cardano-prelude) {})) "development";
 
-  cardano-prelude-test = prev.callCabal2nix "cardano-prelude-test" (inputs.cardano-prelude + /cardano-prelude-test) {};
+  cardano-prelude-test = dontHaddock (prev.callCabal2nix "cardano-prelude-test" (inputs.cardano-prelude + /cardano-prelude-test) {});
+
+  cardano-strict-containers = enableCabalFlag (prev.callCabal2nix "cardano-strict-containers" (inputs.cardano-base + /cardano-strict-containers) {}) "development";
 
   flat = dontCheck (prev.callCabal2nix "flat" inputs.flat { });
 
   fin = doJailbreak prev.fin;
 
-#  heapwords = enableCabalFlag (prev.callCabal2nix "heapwords" (inputs.cardano-base + /heapwords) {}) "development";
+  heapwords = enableCabalFlag (prev.callCabal2nix "heapwords" (inputs.cardano-base + /heapwords) {}) "development";
 
   inline-r = doJailbreak (prev.callCabal2nix "inline-r" (inputs.HaskellR + /inline-r) {});
 
@@ -63,12 +67,12 @@ final: prev: with pkgs.haskell.lib;
 
   ref-tf = prev.callHackage "ref-tf" "0.5.0.1" { };
 
+  secp256k1 = pkgs.secp256k1;
+
   secp256k1-haskell = addPkgconfigDepend (dontCheck (prev.secp256k1-haskell)) pkgs.secp256k1;
 
   singletons-th = prev.callHackage "singletons-th" "3.1.1" { };
 
-  strict-containers = enableCabalFlag (prev.callCabal2nix "strict-containers" (inputs.cardano-base + /strict-containers) {}) "development";
-
   th-extras = doJailbreak prev.th-extras;
 
   th-desugar = prev.callHackage "th-desugar" "1.14" {};