diff --git a/Cargo.lock b/Cargo.lock
index ca87066d15..da4e72a60f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -923,7 +923,7 @@ dependencies = [
  "omicron-common",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
- "oxnet 0.1.0",
+ "oxnet",
  "progenitor",
  "regress 0.9.1",
  "reqwest",
@@ -2104,8 +2104,9 @@ dependencies = [
 [[package]]
 name = "ddm-admin-client"
 version = "0.1.0"
+source = "git+https://github.com/oxidecomputer/maghemite?rev=93cd0d642cf1b58f9f4528275e2a2aa758e9feb3#93cd0d642cf1b58f9f4528275e2a2aa758e9feb3"
 dependencies = [
- "oxnet 0.1.0",
+ "oxnet",
  "percent-encoding",
  "progenitor",
  "reqwest",
@@ -2372,6 +2373,8 @@ version = "0.10.0"
 dependencies = [
  "diffus-derive",
  "itertools 0.10.5",
+ "newtype-uuid",
+ "oxnet",
  "uuid",
 ]
 
@@ -4492,7 +4495,7 @@ dependencies = [
  "opte-ioctl",
  "oxide-vpc",
  "oxlog",
- "oxnet 0.1.0",
+ "oxnet",
  "regress 0.9.1",
  "schemars",
  "serde",
@@ -5144,7 +5147,7 @@ dependencies = [
  "num_enum",
  "nvpair",
  "nvpair-sys",
- "oxnet 0.1.0 (git+https://github.com/oxidecomputer/oxnet)",
+ "oxnet",
  "rand",
  "rusty-doors",
  "socket2",
@@ -5166,7 +5169,7 @@ dependencies = [
  "num_enum",
  "nvpair",
  "nvpair-sys",
- "oxnet 0.1.0 (git+https://github.com/oxidecomputer/oxnet)",
+ "oxnet",
  "rand",
  "rusty-doors",
  "socket2",
@@ -5654,8 +5657,9 @@ dependencies = [
 [[package]]
 name = "newtype-uuid"
 version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c8781e2ef64806278a55ad223f0bc875772fd40e1fe6e73e8adbf027817229d"
 dependencies = [
- "diffus",
  "schemars",
  "serde",
  "uuid",
@@ -5720,7 +5724,7 @@ dependencies = [
  "omicron-passwords",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
- "oxnet 0.1.0",
+ "oxnet",
  "progenitor",
  "regress 0.9.1",
  "reqwest",
@@ -5795,7 +5799,7 @@ dependencies = [
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
  "once_cell",
- "oxnet 0.1.0",
+ "oxnet",
  "parse-display",
  "pq-sys",
  "rand",
@@ -5861,7 +5865,7 @@ dependencies = [
  "openapiv3",
  "oso",
  "oximeter",
- "oxnet 0.1.0",
+ "oxnet",
  "paste",
  "pem",
  "petgraph",
@@ -5903,7 +5907,7 @@ dependencies = [
  "omicron-common",
  "omicron-workspace-hack",
  "once_cell",
- "oxnet 0.1.0",
+ "oxnet",
  "rand",
  "serde_json",
 ]
@@ -6019,7 +6023,7 @@ dependencies = [
  "nexus-db-queries",
  "omicron-common",
  "omicron-workspace-hack",
- "oxnet 0.1.0",
+ "oxnet",
  "reqwest",
  "sled-agent-client",
  "slog",
@@ -6063,7 +6067,7 @@ dependencies = [
  "omicron-test-utils",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
- "oxnet 0.1.0",
+ "oxnet",
  "pq-sys",
  "reqwest",
  "sled-agent-client",
@@ -6100,7 +6104,7 @@ dependencies = [
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
  "once_cell",
- "oxnet 0.1.0",
+ "oxnet",
  "proptest",
  "rand",
  "sled-agent-client",
@@ -6253,7 +6257,7 @@ dependencies = [
  "oximeter",
  "oximeter-collector",
  "oximeter-producer",
- "oxnet 0.1.0",
+ "oxnet",
  "serde",
  "serde_json",
  "serde_urlencoded",
@@ -6304,7 +6308,7 @@ dependencies = [
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
  "openssl",
- "oxnet 0.1.0",
+ "oxnet",
  "oxql-types",
  "parse-display",
  "proptest",
@@ -6725,7 +6729,7 @@ dependencies = [
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
  "once_cell",
- "oxnet 0.1.0",
+ "oxnet",
  "parse-display",
  "progenitor-client",
  "proptest",
@@ -6995,7 +6999,7 @@ dependencies = [
  "oximeter-db",
  "oximeter-instruments",
  "oximeter-producer",
- "oxnet 0.1.0",
+ "oxnet",
  "oxql-types",
  "parse-display",
  "paste",
@@ -7267,7 +7271,7 @@ dependencies = [
  "oximeter",
  "oximeter-instruments",
  "oximeter-producer",
- "oxnet 0.1.0",
+ "oxnet",
  "pretty_assertions",
  "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=220a6f367c18f2452dbc4fa9086f3fe73b961739)",
  "propolis-mock-server",
@@ -8088,17 +8092,6 @@ dependencies = [
  "uuid",
 ]
 
-[[package]]
-name = "oxnet"
-version = "0.1.0"
-dependencies = [
- "diffus",
- "ipnetwork",
- "schemars",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "oxnet"
 version = "0.1.0"
@@ -10729,7 +10722,7 @@ dependencies = [
  "omicron-common",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
- "oxnet 0.1.0",
+ "oxnet",
  "progenitor",
  "regress 0.9.1",
  "reqwest",
@@ -10755,7 +10748,7 @@ dependencies = [
  "omicron-test-utils",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
- "oxnet 0.1.0",
+ "oxnet",
  "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=220a6f367c18f2452dbc4fa9086f3fe73b961739)",
  "rcgen",
  "schemars",
@@ -13085,7 +13078,7 @@ dependencies = [
  "omicron-common",
  "omicron-workspace-hack",
  "owo-colors",
- "oxnet 0.1.0",
+ "oxnet",
  "schemars",
  "serde",
  "serde_json",
@@ -13170,7 +13163,7 @@ dependencies = [
  "once_cell",
  "openapi-lint",
  "openapiv3",
- "oxnet 0.1.0",
+ "oxnet",
  "rand",
  "reqwest",
  "schemars",
@@ -13268,7 +13261,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -13825,7 +13818,7 @@ dependencies = [
  "omicron-common",
  "omicron-sled-agent",
  "omicron-workspace-hack",
- "oxnet 0.1.0",
+ "oxnet",
  "serde_json",
  "sled-hardware-types",
  "slog",
diff --git a/Cargo.toml b/Cargo.toml
index d15926cb6d..28b437320a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -365,7 +365,7 @@ derive-where = "1.2.7"
 diesel = { version = "2.2.4", features = ["i-implement-a-third-party-backend-and-opt-into-breaking-changes", "postgres", "r2d2", "chrono", "serde_json", "network-address", "uuid"] }
 diesel-dtrace = "0.4.2"
 #diffus = { version = "0.10.0", features = ["uuid-impl", "derive"] }
-diffus = { path = "../diffus/diffus", features = ["uuid-impl", "derive"] }
+diffus = { path = "../diffus/diffus", features = ["uuid-impl", "derive", "newtype-uuid-impl", "oxnet-impl"] }
 dns-server = { path = "dns-server" }
 dns-server-api = { path = "dns-server-api" }
 dns-service-client = { path = "clients/dns-service-client" }
@@ -452,8 +452,7 @@ maplit = "1.0.2"
 mockall = "0.13"
 newtype_derive = "0.1.6"
 mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "93cd0d642cf1b58f9f4528275e2a2aa758e9feb3" }
-#ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "93cd0d642cf1b58f9f4528275e2a2aa758e9feb3" }
-ddm-admin-client = { path = "../maghemite/ddm-admin-client" }
+ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "93cd0d642cf1b58f9f4528275e2a2aa758e9feb3" }
 multimap = "0.10.0"
 nexus-auth = { path = "nexus/auth" }
 nexus-client = { path = "clients/nexus-client" }
@@ -499,8 +498,7 @@ omicron-zone-package = "0.11.1"
 oxide-client = { path = "clients/oxide-client" }
 oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "b56afeeb14e0042cbd7bda85b166ed86ee17820e", features = [ "api", "std" ] }
 oxlog = { path = "dev-tools/oxlog" }
-#oxnet = { git = "https://github.com/oxidecomputer/oxnet", features = ["diffus"] }
-oxnet = { path = "../oxnet", features = ["diffus"] }
+oxnet = { git = "https://github.com/oxidecomputer/oxnet" }
 once_cell = "1.20.2"
 openapi-lint = { git = "https://github.com/oxidecomputer/openapi-lint", branch = "main" }
 openapi-manager-types = { path = "dev-tools/openapi-manager/types" }
@@ -676,9 +674,8 @@ zone = { version = "0.3", default-features = false, features = ["async"] }
 # the kinds). However, uses of omicron-uuid-kinds _within omicron_ will have
 # std and the other features enabled because they'll refer to it via
 # omicron-uuid-kinds.workspace = true.
-#newtype-uuid = { version = "1.1.3", default-features = false }
-newtype-uuid = { path = "../newtype-uuid/crates/newtype-uuid", default-features = false }
-omicron-uuid-kinds = { path = "uuid-kinds", features = ["serde", "schemars08", "uuid-v4", "diffus"] }
+newtype-uuid = { version = "1.1.3", default-features = false }
+omicron-uuid-kinds = { path = "uuid-kinds", features = ["serde", "schemars08", "uuid-v4"] }
 
 # NOTE: The test profile inherits from the dev profile, so settings under
 # profile.dev get inherited. AVOID setting anything under profile.test: that
diff --git a/nexus/types/src/deployment.rs b/nexus/types/src/deployment.rs
index 23542b76ff..ea41375d78 100644
--- a/nexus/types/src/deployment.rs
+++ b/nexus/types/src/deployment.rs
@@ -190,7 +190,7 @@ pub struct Blueprint {
     pub clickhouse_cluster_config: Option<ClickhouseClusterConfig>,
 
     /// when this blueprint was generated (for debugging)
-    #[diffus_ignore]
+    #[diffus(ignore)]
     pub time_created: chrono::DateTime<chrono::Utc>,
     /// identity of the component that generated the blueprint (for debugging)
     /// This would generally be the Uuid of a Nexus instance.
diff --git a/uuid-kinds/Cargo.toml b/uuid-kinds/Cargo.toml
index 61bea773aa..0a80fab9c9 100644
--- a/uuid-kinds/Cargo.toml
+++ b/uuid-kinds/Cargo.toml
@@ -19,7 +19,6 @@ paste.workspace = true
 
 [features]
 default = ["std"]
-diffus = ["newtype-uuid/diffus"]
 serde = ["newtype-uuid/serde"]
 schemars08 = ["newtype-uuid/schemars08", "schemars", "std"]
 std = ["newtype-uuid/std"]
diff --git a/uuid-kinds/src/lib.rs b/uuid-kinds/src/lib.rs
index e25e4e9bbb..e4f65d7039 100644
--- a/uuid-kinds/src/lib.rs
+++ b/uuid-kinds/src/lib.rs
@@ -14,7 +14,6 @@ pub use newtype_uuid::{
     GenericUuid, ParseError, TagError, TypedUuid, TypedUuidKind, TypedUuidTag,
 };
 
-#[cfg(feature = "diffus")]
 use diffus::Diffus;
 #[cfg(feature = "schemars08")]
 use schemars::JsonSchema;
@@ -24,7 +23,7 @@ macro_rules! impl_typed_uuid_kind {
         $(
             paste::paste! {
                 #[cfg_attr(feature = "schemars08", derive(JsonSchema))]
-                #[cfg_attr(feature = "diffus", derive(Diffus))]
+                #[derive(Diffus)]
                 pub enum [< $kind Kind>] {}
 
                 impl TypedUuidKind for [< $kind Kind >] {