diff --git a/Cargo.lock b/Cargo.lock
index c504b4234d..5ba9d02942 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -454,7 +454,6 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 [[package]]
 name = "flowistry"
 version = "0.5.41"
-source = "git+https://github.com/brownsys/flowistry?rev=a2ccfca2e6b5668ffd246eddc6abaf4d6e440a35#a2ccfca2e6b5668ffd246eddc6abaf4d6e440a35"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -491,7 +490,7 @@ dependencies = [
  "itertools 0.12.0",
  "log",
  "petgraph",
- "rustc_utils 0.7.4-nightly-2023-08-25 (git+https://github.com/JustusAdam/rustc_plugin?rev=e990ded60afc928f76293fb9ad265c58405da1a7)",
+ "rustc_utils 0.7.4-nightly-2023-08-25 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -920,8 +919,8 @@ dependencies = [
  "paralegal-spdg",
  "petgraph",
  "pretty",
- "rustc_plugin",
- "rustc_utils 0.7.4-nightly-2023-08-25 (git+https://github.com/JustusAdam/rustc_plugin?rev=e990ded60afc928f76293fb9ad265c58405da1a7)",
+ "rustc_plugin 0.7.4-nightly-2023-08-25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_utils 0.7.4-nightly-2023-08-25 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde",
  "serde_bare",
  "serial_test",
@@ -1108,7 +1107,14 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 [[package]]
 name = "rustc_plugin"
 version = "0.7.4-nightly-2023-08-25"
-source = "git+https://github.com/JustusAdam/rustc_plugin?rev=e990ded60afc928f76293fb9ad265c58405da1a7#e990ded60afc928f76293fb9ad265c58405da1a7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1348edfa020dbe4807a4d99272332dadcbbedff6b587accb95faefe20d2c7129"
+replace = "rustc_plugin 0.7.4-nightly-2023-08-25 (git+https://github.com/JustusAdam/rustc_plugin?rev=dfcce83759b46ecd585d9d56e5c8e8d0b3df5b3c)"
+
+[[package]]
+name = "rustc_plugin"
+version = "0.7.4-nightly-2023-08-25"
+source = "git+https://github.com/JustusAdam/rustc_plugin?rev=dfcce83759b46ecd585d9d56e5c8e8d0b3df5b3c#dfcce83759b46ecd585d9d56e5c8e8d0b3df5b3c"
 dependencies = [
  "cargo_metadata",
  "log",
@@ -1129,18 +1135,12 @@ name = "rustc_utils"
 version = "0.7.4-nightly-2023-08-25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09428c7086894369685cca54a516acc0f0ab6d0e5a628c094ba83bfddaf1aedf"
-dependencies = [
- "anyhow",
- "cfg-if",
- "indexical",
- "intervaltree",
- "log",
-]
+replace = "rustc_utils 0.7.4-nightly-2023-08-25 (git+https://github.com/JustusAdam/rustc_plugin?rev=dfcce83759b46ecd585d9d56e5c8e8d0b3df5b3c)"
 
 [[package]]
 name = "rustc_utils"
 version = "0.7.4-nightly-2023-08-25"
-source = "git+https://github.com/JustusAdam/rustc_plugin?rev=e990ded60afc928f76293fb9ad265c58405da1a7#e990ded60afc928f76293fb9ad265c58405da1a7"
+source = "git+https://github.com/JustusAdam/rustc_plugin?rev=dfcce83759b46ecd585d9d56e5c8e8d0b3df5b3c#dfcce83759b46ecd585d9d56e5c8e8d0b3df5b3c"
 dependencies = [
  "anyhow",
  "cfg-if",
diff --git a/Cargo.toml b/Cargo.toml
index 625b66952b..6f040ffce5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,22 +13,23 @@ indexical = "0.3.1"
 serde = "1.0.188"
 petgraph = { version = "0.6", features = ["serde-1"] }
 strum = { version = "0.25", features = ["derive"] }
-# rustc_utils = { version = "=0.7.4-nightly-2023-08-25", features = [
-#     "indexical",
-# ] }
-# rustc_plugin = "=0.7.4-nightly-2023-08-25"
-rustc_utils = { git = "https://github.com/JustusAdam/rustc_plugin", rev = "e990ded60afc928f76293fb9ad265c58405da1a7", features = [
+anyhow = { version = "1.0.72", features = ["backtrace"] }
+
+rustc_utils = { version = "=0.7.4-nightly-2023-08-25", features = [
     "indexical",
 ] }
-rustc_plugin = { git = "https://github.com/JustusAdam/rustc_plugin", rev = "e990ded60afc928f76293fb9ad265c58405da1a7" }
-#rustc_plugin = { path = "../rustc_plugin/crates/rustc_plugin" }
-#rustc_utils = { path = "../rustc_plugin/crates/rustc_utils", features = ["indexical"] }
-flowistry = { git = "https://github.com/brownsys/flowistry", rev = "a2ccfca2e6b5668ffd246eddc6abaf4d6e440a35", default-features = false }
-anyhow = { version = "1.0.72", features = ["backtrace"] }
+rustc_plugin = "=0.7.4-nightly-2023-08-25"
+flowistry = { path = "../flowistry/crates/flowistry", default-features = false }
+#flowistry = { git = "https://github.com/brownsys/flowistry", rev = "a2ccfca2e6b5668ffd246eddc6abaf4d6e440a35", default-features = false }
 
 [profile.release]
 debug = true
 
-# [replace]
+[replace]
 # "rustc_utils:0.7.4-nightly-2023-08-25" = { path = "../rustc_plugin/crates/rustc_utils" }
 # "rustc_plugin:0.7.4-nightly-2023-08-25" = { path = "../rustc_plugin/crates/rustc_plugin" }
+
+"rustc_utils:0.7.4-nightly-2023-08-25" = { git = "https://github.com/JustusAdam/rustc_plugin", rev = "dfcce83759b46ecd585d9d56e5c8e8d0b3df5b3c", features = [
+    "indexical",
+] }
+"rustc_plugin:0.7.4-nightly-2023-08-25" = { git = "https://github.com/JustusAdam/rustc_plugin", rev = "dfcce83759b46ecd585d9d56e5c8e8d0b3df5b3c" }