diff --git a/Cargo.lock b/Cargo.lock
index 52305fa47..646de1e9e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3410,6 +3410,7 @@ dependencies = [
  "kitsune-config",
  "kitsune-core",
  "kitsune-db",
+ "kitsune-derive",
  "kitsune-email",
  "kitsune-embed",
  "kitsune-error",
@@ -3673,7 +3674,6 @@ dependencies = [
  "once_cell",
  "scraper",
  "smol_str",
- "typed-builder",
 ]
 
 [[package]]
@@ -3861,6 +3861,7 @@ dependencies = [
  "http 1.1.0",
  "http-body-util",
  "kitsune-config",
+ "kitsune-derive",
  "kitsune-error",
  "kitsune-http-client",
  "moka",
@@ -3917,6 +3918,7 @@ dependencies = [
  "http 1.1.0",
  "kitsune-config",
  "kitsune-db",
+ "kitsune-derive",
  "kitsune-error",
  "kitsune-http-client",
  "kitsune-language",
@@ -3927,7 +3929,6 @@ dependencies = [
  "speedy-uuid",
  "strum",
  "tracing",
- "typed-builder",
 ]
 
 [[package]]
@@ -3958,6 +3959,7 @@ dependencies = [
  "kitsune-config",
  "kitsune-core",
  "kitsune-db",
+ "kitsune-derive",
  "kitsune-email",
  "kitsune-embed",
  "kitsune-error",
@@ -4050,9 +4052,9 @@ dependencies = [
 name = "kitsune-url"
 version = "0.0.1-pre.6"
 dependencies = [
+ "kitsune-derive",
  "smol_str",
  "speedy-uuid",
- "typed-builder",
 ]
 
 [[package]]
@@ -4080,6 +4082,7 @@ dependencies = [
  "enum_dispatch",
  "futures-util",
  "kitsune-config",
+ "kitsune-derive",
  "kitsune-error",
  "kitsune-type",
  "mrf-manifest",
@@ -4093,7 +4096,6 @@ dependencies = [
  "tokio",
  "tracing",
  "tracing-subscriber",
- "typed-builder",
  "walkdir",
  "wasmtime",
  "wasmtime-wasi",
diff --git a/crates/kitsune-derive/impl/src/expand.rs b/crates/kitsune-derive/impl/src/expand.rs
index cb6839578..d5b7c93e0 100644
--- a/crates/kitsune-derive/impl/src/expand.rs
+++ b/crates/kitsune-derive/impl/src/expand.rs
@@ -53,6 +53,7 @@ fn expand_builder(
     let attrs = quote! {
         #[derive(::kitsune_derive::typed_builder::TypedBuilder)]
         #[builder(build_method(into = #struct_name))]
+        #[builder(crate_module_path = ::kitsune_derive::typed_builder)]
     };
     let impls = quote! {
         impl #struct_name {
diff --git a/crates/kitsune-embed/Cargo.toml b/crates/kitsune-embed/Cargo.toml
index 76625d28c..97d6c8576 100644
--- a/crates/kitsune-embed/Cargo.toml
+++ b/crates/kitsune-embed/Cargo.toml
@@ -18,7 +18,6 @@ kitsune-http-client = { path = "../kitsune-http-client" }
 once_cell = "1.19.0"
 scraper = { version = "0.19.0", default-features = false }
 smol_str = "0.2.1"
-typed-builder = "0.18.2"
 
 [lints]
 workspace = true
diff --git a/crates/kitsune-embed/src/lib.rs b/crates/kitsune-embed/src/lib.rs
index fcb80e75b..1cf3a158a 100644
--- a/crates/kitsune-embed/src/lib.rs
+++ b/crates/kitsune-embed/src/lib.rs
@@ -15,7 +15,6 @@ use kitsune_http_client::Client as HttpClient;
 use once_cell::sync::Lazy;
 use scraper::{Html, Selector};
 use smol_str::SmolStr;
-use typed_builder::TypedBuilder;
 
 pub use embed_sdk;
 pub use embed_sdk::Embed;
@@ -33,7 +32,7 @@ fn first_link_from_fragment(fragment: &str) -> Option<String> {
         .and_then(|element| element.value().attr("href").map(ToString::to_string))
 }
 
-#[derive(Clone, TypedBuilder)]
+#[kitsune_service]
 pub struct Client {
     db_pool: PgPool,
     #[builder(setter(into))]
diff --git a/crates/kitsune-federation-filter/Cargo.toml b/crates/kitsune-federation-filter/Cargo.toml
index 738883b0c..06d8d4cd7 100644
--- a/crates/kitsune-federation-filter/Cargo.toml
+++ b/crates/kitsune-federation-filter/Cargo.toml
@@ -8,7 +8,7 @@ license.workspace = true
 [dependencies]
 globset = "0.4.14"
 kitsune-config = { path = "../kitsune-config" }
-kitsune-derive = { version = "0.0.1-pre.6", path = "../kitsune-derive" }
+kitsune-derive = { path = "../kitsune-derive" }
 kitsune-error = { path = "../kitsune-error" }
 kitsune-type = { path = "../kitsune-type" }
 url = "2.5.0"
diff --git a/crates/kitsune-oidc/Cargo.toml b/crates/kitsune-oidc/Cargo.toml
index 0e415e0ca..a140b4797 100644
--- a/crates/kitsune-oidc/Cargo.toml
+++ b/crates/kitsune-oidc/Cargo.toml
@@ -10,6 +10,7 @@ enum_dispatch = "0.3.13"
 http = "1.1.0"
 http-body-util = "0.1.1"
 kitsune-config = { path = "../kitsune-config" }
+kitsune-derive = { path = "../kitsune-derive" }
 kitsune-error = { path = "../kitsune-error" }
 kitsune-http-client = { path = "../kitsune-http-client" }
 moka = { version = "0.12.7", features = ["future"] }
diff --git a/crates/kitsune-oidc/src/lib.rs b/crates/kitsune-oidc/src/lib.rs
index b7cb5af93..3de18cf33 100644
--- a/crates/kitsune-oidc/src/lib.rs
+++ b/crates/kitsune-oidc/src/lib.rs
@@ -3,6 +3,7 @@ use crate::state::{
     LoginState, OAuth2LoginState, Store,
 };
 use kitsune_config::oidc::{Configuration, StoreConfiguration};
+use kitsune_derive::kitsune_service;
 use kitsune_error::{bail, kitsune_error, Result};
 use multiplex_pool::RoundRobinStrategy;
 use openidconnect::{
@@ -66,7 +67,7 @@ pub struct UserInfo {
     pub oauth2: OAuth2Info,
 }
 
-#[derive(Clone)]
+#[kitsune_service(omit_builder)]
 pub struct OidcService {
     client: OidcClient,
     login_state_store: self::state::AnyStore,
@@ -103,10 +104,11 @@ impl OidcService {
             }
         };
 
-        Ok(Self {
+        Ok(__OidcService__Inner {
             client,
             login_state_store,
-        })
+        }
+        .into())
     }
 
     pub async fn authorisation_url(
diff --git a/crates/kitsune-search/Cargo.toml b/crates/kitsune-search/Cargo.toml
index a74301481..eeca5f04e 100644
--- a/crates/kitsune-search/Cargo.toml
+++ b/crates/kitsune-search/Cargo.toml
@@ -17,6 +17,7 @@ futures-util = "0.3.30"
 http = "1.1.0"
 kitsune-config = { path = "../kitsune-config" }
 kitsune-db = { path = "../kitsune-db" }
+kitsune-derive = { path = "../kitsune-derive" }
 kitsune-error = { path = "../kitsune-error" }
 kitsune-http-client = { path = "../kitsune-http-client" }
 kitsune-language = { path = "../kitsune-language" }
@@ -27,7 +28,6 @@ serde_urlencoded = "0.7.1"
 speedy-uuid = { path = "../../lib/speedy-uuid" }
 strum = { version = "0.26.2", features = ["derive"] }
 tracing = "0.1.40"
-typed-builder = "0.18.2"
 
 [lints]
 workspace = true
diff --git a/crates/kitsune-search/src/meilisearch/mod.rs b/crates/kitsune-search/src/meilisearch/mod.rs
index ed516b8ff..4d452e5cd 100644
--- a/crates/kitsune-search/src/meilisearch/mod.rs
+++ b/crates/kitsune-search/src/meilisearch/mod.rs
@@ -1,5 +1,6 @@
 use self::http_client::HttpClient;
 use super::{Result, SearchBackend, SearchIndex, SearchItem, SearchResultReference};
+use kitsune_derive::kitsune_service;
 use meilisearch_sdk::{client::Client, indexes::Index, settings::Settings};
 use serde::Deserialize;
 use speedy_uuid::Uuid;
@@ -12,7 +13,7 @@ struct MeilisearchResult {
     id: Uuid,
 }
 
-#[derive(Clone)]
+#[kitsune_service(omit_builder)]
 pub struct MeiliSearchService {
     client: Client<HttpClient>,
 }
@@ -29,9 +30,9 @@ impl MeiliSearchService {
                 .content_length_limit(None)
                 .build(),
         };
-        let service = Self {
+        let service = Self::from(__MeiliSearchService__Inner {
             client: Client::new_with_client(host, Some(api_key), http_client),
-        };
+        });
 
         let settings = Settings::new()
             .with_filterable_attributes(["created_at"])
diff --git a/crates/kitsune-search/src/sql.rs b/crates/kitsune-search/src/sql.rs
index a2f76485a..0c947ef20 100644
--- a/crates/kitsune-search/src/sql.rs
+++ b/crates/kitsune-search/src/sql.rs
@@ -11,10 +11,10 @@ use kitsune_db::{
     schema::{accounts, posts},
     with_connection, PgPool,
 };
+use kitsune_derive::kitsune_service;
 use speedy_uuid::Uuid;
-use typed_builder::TypedBuilder;
 
-#[derive(Clone, TypedBuilder)]
+#[kitsune_service]
 pub struct SearchService {
     db_pool: PgPool,
     language_detection_config: LanguageDetectionConfig,
diff --git a/crates/kitsune-service/Cargo.toml b/crates/kitsune-service/Cargo.toml
index 6d8205c91..40f744790 100644
--- a/crates/kitsune-service/Cargo.toml
+++ b/crates/kitsune-service/Cargo.toml
@@ -32,6 +32,7 @@ kitsune-captcha = { path = "../kitsune-captcha" }
 kitsune-config = { path = "../kitsune-config" }
 kitsune-core = { path = "../kitsune-core" }
 kitsune-db = { path = "../kitsune-db" }
+kitsune-derive = { path = "../kitsune-derive" }
 kitsune-email = { path = "../kitsune-email" }
 kitsune-embed = { path = "../kitsune-embed" }
 kitsune-error = { path = "../kitsune-error" }
diff --git a/crates/kitsune-service/src/account.rs b/crates/kitsune-service/src/account.rs
index 08112ed4d..815f2796c 100644
--- a/crates/kitsune-service/src/account.rs
+++ b/crates/kitsune-service/src/account.rs
@@ -27,6 +27,7 @@ use kitsune_db::{
     schema::{accounts, accounts_follows, accounts_preferences, notifications, posts},
     with_connection, PgPool,
 };
+use kitsune_derive::kitsune_service;
 use kitsune_error::{Error, Result};
 use kitsune_jobs::deliver::{
     accept::DeliverAccept,
@@ -178,7 +179,7 @@ impl<A, H> Update<A, H> {
     }
 }
 
-#[derive(Clone, TypedBuilder)]
+#[kitsune_service]
 pub struct AccountService {
     attachment_service: AttachmentService,
     db_pool: PgPool,
diff --git a/crates/kitsune-service/src/attachment.rs b/crates/kitsune-service/src/attachment.rs
index f31e7aa09..c52a2b2b9 100644
--- a/crates/kitsune-service/src/attachment.rs
+++ b/crates/kitsune-service/src/attachment.rs
@@ -11,6 +11,7 @@ use kitsune_db::{
     schema::media_attachments,
     with_connection, PgPool,
 };
+use kitsune_derive::kitsune_service;
 use kitsune_error::{kitsune_error, Error, ErrorType, Result};
 use kitsune_http_client::Client;
 use kitsune_storage::{AnyStorageBackend, StorageBackend};
@@ -73,7 +74,7 @@ impl<S> Upload<S> {
     }
 }
 
-#[derive(Clone, TypedBuilder)]
+#[kitsune_service]
 pub struct AttachmentService {
     #[builder(default =
         Client::builder()
diff --git a/crates/kitsune-service/src/captcha.rs b/crates/kitsune-service/src/captcha.rs
index 2f61abae2..3b203ab05 100644
--- a/crates/kitsune-service/src/captcha.rs
+++ b/crates/kitsune-service/src/captcha.rs
@@ -1,8 +1,8 @@
 use kitsune_captcha::{AnyCaptcha, CaptchaBackend, ChallengeStatus};
+use kitsune_derive::kitsune_service;
 use kitsune_error::Result;
-use typed_builder::TypedBuilder;
 
-#[derive(Clone, TypedBuilder)]
+#[kitsune_service]
 pub struct CaptchaService {
     #[builder(setter(into))]
     pub backend: Option<AnyCaptcha>,
diff --git a/crates/kitsune-service/src/custom_emoji.rs b/crates/kitsune-service/src/custom_emoji.rs
index f48be5bad..9dbb54ea5 100644
--- a/crates/kitsune-service/src/custom_emoji.rs
+++ b/crates/kitsune-service/src/custom_emoji.rs
@@ -14,6 +14,7 @@ use kitsune_db::{
     schema::{custom_emojis, media_attachments, posts, posts_custom_emojis},
     with_connection, PgPool,
 };
+use kitsune_derive::kitsune_service;
 use kitsune_error::{Error, Result};
 use kitsune_url::UrlService;
 use speedy_uuid::Uuid;
@@ -60,7 +61,7 @@ pub struct EmojiUpload<S> {
     stream: S,
 }
 
-#[derive(Clone, TypedBuilder)]
+#[kitsune_service]
 pub struct CustomEmojiService {
     attachment_service: AttachmentService,
     db_pool: PgPool,
diff --git a/crates/kitsune-service/src/instance.rs b/crates/kitsune-service/src/instance.rs
index 30188506e..08bd112d5 100644
--- a/crates/kitsune-service/src/instance.rs
+++ b/crates/kitsune-service/src/instance.rs
@@ -4,11 +4,11 @@ use kitsune_db::{
     schema::{accounts, posts, users},
     with_connection, PgPool,
 };
+use kitsune_derive::kitsune_service;
 use kitsune_error::{Error, Result};
 use smol_str::SmolStr;
-use typed_builder::TypedBuilder;
 
-#[derive(Clone, TypedBuilder)]
+#[kitsune_service]
 pub struct InstanceService {
     db_pool: PgPool,
     #[builder(setter(into))]
diff --git a/crates/kitsune-service/src/job.rs b/crates/kitsune-service/src/job.rs
index aa1562c95..9410c6284 100644
--- a/crates/kitsune-service/src/job.rs
+++ b/crates/kitsune-service/src/job.rs
@@ -1,5 +1,6 @@
 use athena::{JobDetails, JobQueue};
 use iso8601_timestamp::Timestamp;
+use kitsune_derive::kitsune_service;
 use kitsune_error::Result;
 use kitsune_jobs::{Job, KitsuneContextRepo};
 use std::sync::Arc;
@@ -12,7 +13,7 @@ pub struct Enqueue<T> {
     run_at: Option<Timestamp>,
 }
 
-#[derive(Clone, TypedBuilder)]
+#[kitsune_service]
 pub struct JobService {
     job_queue: Arc<dyn JobQueue<ContextRepository = KitsuneContextRepo>>,
 }
diff --git a/crates/kitsune-service/src/notification.rs b/crates/kitsune-service/src/notification.rs
index 2171f281f..ae6613f90 100644
--- a/crates/kitsune-service/src/notification.rs
+++ b/crates/kitsune-service/src/notification.rs
@@ -11,11 +11,12 @@ use kitsune_db::{
     schema::{accounts, accounts_follows, accounts_preferences, notifications, posts},
     with_connection, PgPool,
 };
+use kitsune_derive::kitsune_service;
 use kitsune_error::{Error, Result};
 use speedy_uuid::Uuid;
 use typed_builder::TypedBuilder;
 
-#[derive(Clone, TypedBuilder)]
+#[kitsune_service]
 pub struct NotificationService {
     db_pool: PgPool,
 }
diff --git a/crates/kitsune-service/src/post/mod.rs b/crates/kitsune-service/src/post/mod.rs
index d980ae1eb..daff6bd92 100644
--- a/crates/kitsune-service/src/post/mod.rs
+++ b/crates/kitsune-service/src/post/mod.rs
@@ -33,6 +33,7 @@ use kitsune_db::{
     },
     with_connection, with_transaction, PgPool,
 };
+use kitsune_derive::kitsune_service;
 use kitsune_embed::Client as EmbedClient;
 use kitsune_error::{bail, Error, ErrorType, Result};
 use kitsune_jobs::deliver::{
@@ -294,7 +295,7 @@ pub struct GetAccountsInteractingWithPost {
     max_id: Option<Uuid>,
 }
 
-#[derive(Clone, TypedBuilder)]
+#[kitsune_service]
 pub struct PostService {
     db_pool: PgPool,
     embed_client: Option<EmbedClient>,
diff --git a/crates/kitsune-service/src/search.rs b/crates/kitsune-service/src/search.rs
index 401818f3f..9a520a0c8 100644
--- a/crates/kitsune-service/src/search.rs
+++ b/crates/kitsune-service/src/search.rs
@@ -9,6 +9,7 @@ use kitsune_db::{
     schema::{accounts, posts},
     with_connection, PgPool,
 };
+use kitsune_derive::kitsune_service;
 use kitsune_error::Result;
 use kitsune_search::{SearchBackend, SearchIndex};
 use speedy_uuid::Uuid;
@@ -37,7 +38,7 @@ pub struct Search<'a> {
     max_id: Option<Uuid>,
 }
 
-#[derive(Clone, TypedBuilder)]
+#[kitsune_service]
 pub struct SearchService {
     db_pool: PgPool,
     fetcher: Arc<dyn Fetcher>,
diff --git a/crates/kitsune-service/src/timeline.rs b/crates/kitsune-service/src/timeline.rs
index a7a1f3292..abdd68ca0 100644
--- a/crates/kitsune-service/src/timeline.rs
+++ b/crates/kitsune-service/src/timeline.rs
@@ -9,6 +9,7 @@ use kitsune_db::{
     schema::{accounts_follows, posts, posts_mentions},
     with_connection, PgPool,
 };
+use kitsune_derive::kitsune_service;
 use kitsune_error::{Error, Result};
 use speedy_uuid::Uuid;
 use typed_builder::TypedBuilder;
@@ -62,7 +63,7 @@ pub struct GetPublic {
     only_remote: bool,
 }
 
-#[derive(Clone, TypedBuilder)]
+#[kitsune_service]
 pub struct TimelineService {
     db_pool: PgPool,
 }
diff --git a/crates/kitsune-service/src/user.rs b/crates/kitsune-service/src/user.rs
index 743f0147d..f09b83d76 100644
--- a/crates/kitsune-service/src/user.rs
+++ b/crates/kitsune-service/src/user.rs
@@ -16,6 +16,7 @@ use kitsune_db::{
     schema::{accounts, accounts_preferences, users},
     with_transaction, PgPool,
 };
+use kitsune_derive::kitsune_service;
 use kitsune_error::{bail, kitsune_error, Error, ErrorType, Result};
 use kitsune_jobs::mailing::confirmation::SendConfirmationMail;
 use kitsune_url::UrlService;
@@ -112,7 +113,7 @@ pub struct Register {
     force_registration: bool,
 }
 
-#[derive(Clone, TypedBuilder)]
+#[kitsune_service]
 pub struct UserService {
     allow_non_ascii_usernames: bool,
     captcha_service: CaptchaService,
diff --git a/crates/kitsune-url/Cargo.toml b/crates/kitsune-url/Cargo.toml
index a8196b249..1aaf929b0 100644
--- a/crates/kitsune-url/Cargo.toml
+++ b/crates/kitsune-url/Cargo.toml
@@ -6,9 +6,9 @@ version.workspace = true
 license.workspace = true
 
 [dependencies]
+kitsune-derive = { path = "../kitsune-derive" }
 smol_str = "0.2.1"
 speedy-uuid = { path = "../../lib/speedy-uuid" }
-typed-builder = "0.18.2"
 
 [lints]
 workspace = true
diff --git a/crates/kitsune-url/src/lib.rs b/crates/kitsune-url/src/lib.rs
index 440ed2466..61097f186 100644
--- a/crates/kitsune-url/src/lib.rs
+++ b/crates/kitsune-url/src/lib.rs
@@ -1,12 +1,12 @@
+use kitsune_derive::kitsune_service;
 use smol_str::SmolStr;
 use speedy_uuid::Uuid;
-use typed_builder::TypedBuilder;
 
 /// Small "service" to centralise the creation of URLs
 ///
 /// For some light deduplication purposes and to centralise the whole formatting story.
 /// Allows for easier adjustments of URLs.
-#[derive(Clone, TypedBuilder)]
+#[kitsune_service]
 pub struct UrlService {
     #[builder(setter(into))]
     scheme: SmolStr,
diff --git a/crates/kitsune-wasm-mrf/Cargo.toml b/crates/kitsune-wasm-mrf/Cargo.toml
index 4de759a09..7f9eed25d 100644
--- a/crates/kitsune-wasm-mrf/Cargo.toml
+++ b/crates/kitsune-wasm-mrf/Cargo.toml
@@ -16,6 +16,7 @@ futures-util = { version = "0.3.30", default-features = false, features = [
     "alloc",
 ] }
 kitsune-config = { path = "../kitsune-config" }
+kitsune-derive = { path = "../kitsune-derive" }
 kitsune-error = { path = "../kitsune-error" }
 kitsune-type = { path = "../kitsune-type" }
 mrf-manifest = { path = "../../lib/mrf-manifest", features = ["decode"] }
@@ -30,7 +31,6 @@ sled = "0.34.7"
 smol_str = "0.2.1"
 tokio = { version = "1.37.0", features = ["fs"] }
 tracing = "0.1.40"
-typed-builder = "0.18.2"
 walkdir = "2.5.0"
 wasmtime = { version = "20.0.2", default-features = false, features = [
     "addr2line",
diff --git a/crates/kitsune-wasm-mrf/src/lib.rs b/crates/kitsune-wasm-mrf/src/lib.rs
index b519f5be7..a424f7a80 100644
--- a/crates/kitsune-wasm-mrf/src/lib.rs
+++ b/crates/kitsune-wasm-mrf/src/lib.rs
@@ -11,6 +11,7 @@ use futures_util::{stream::FuturesUnordered, Stream, TryFutureExt, TryStreamExt}
 use kitsune_config::mrf::{
     Configuration as MrfConfiguration, FsKvStorage, KvStorage, RedisKvStorage,
 };
+use kitsune_derive::kitsune_service;
 use kitsune_error::Error;
 use kitsune_type::ap::Activity;
 use mrf_manifest::{Manifest, ManifestV1};
@@ -23,7 +24,6 @@ use std::{
     sync::Arc,
 };
 use tokio::fs;
-use typed_builder::TypedBuilder;
 use walkdir::WalkDir;
 use wasmtime::{
     component::{Component, Linker},
@@ -111,7 +111,7 @@ pub struct MrfModule {
     pub manifest: ManifestV1<'static>,
 }
 
-#[derive(Clone, TypedBuilder)]
+#[kitsune_service]
 pub struct MrfService {
     engine: Engine,
     linker: Arc<Linker<Context>>,
@@ -131,12 +131,13 @@ impl MrfService {
         mrf_wit::v1::Mrf::add_to_linker(&mut linker, |ctx| ctx).map_err(eyre::Report::msg)?;
         wasmtime_wasi::add_to_linker_async(&mut linker).map_err(eyre::Report::msg)?;
 
-        Ok(Self {
+        Ok(__MrfService__Inner {
             engine,
             linker: Arc::new(linker),
             modules: modules.into(),
             storage: Arc::new(storage),
-        })
+        }
+        .into())
     }
 
     #[instrument(skip_all, fields(module_dir = %config.module_dir))]
diff --git a/kitsune/Cargo.toml b/kitsune/Cargo.toml
index 080c6c26e..a785dce5c 100644
--- a/kitsune/Cargo.toml
+++ b/kitsune/Cargo.toml
@@ -51,6 +51,7 @@ kitsune-captcha = { path = "../crates/kitsune-captcha" }
 kitsune-config = { path = "../crates/kitsune-config" }
 kitsune-core = { path = "../crates/kitsune-core" }
 kitsune-db = { path = "../crates/kitsune-db" }
+kitsune-derive = { path = "../crates/kitsune-derive" }
 kitsune-email = { path = "../crates/kitsune-email" }
 kitsune-embed = { path = "../crates/kitsune-embed" }
 kitsune-error = { path = "../crates/kitsune-error" }
diff --git a/kitsune/src/oauth2/mod.rs b/kitsune/src/oauth2/mod.rs
index b195e223d..a22cd1751 100644
--- a/kitsune/src/oauth2/mod.rs
+++ b/kitsune/src/oauth2/mod.rs
@@ -9,6 +9,7 @@ use kitsune_db::{
     schema::{oauth2_applications, oauth2_authorization_codes},
     with_connection, PgPool,
 };
+use kitsune_derive::kitsune_service;
 use kitsune_error::{Error, Result};
 use kitsune_url::UrlService;
 use kitsune_util::generate_secret;
@@ -84,7 +85,7 @@ struct ShowTokenPage {
     token: String,
 }
 
-#[derive(Clone, TypedBuilder)]
+#[kitsune_service]
 pub struct OAuth2Service {
     db_pool: PgPool,
     url_service: UrlService,
diff --git a/lib/masto-id-convert/fuzz/Cargo.lock b/lib/masto-id-convert/fuzz/Cargo.lock
index 374e96768..9b40396c5 100644
--- a/lib/masto-id-convert/fuzz/Cargo.lock
+++ b/lib/masto-id-convert/fuzz/Cargo.lock
@@ -16,28 +16,29 @@ checksum = "b6970a22a33d6a8f862aac371bac48505a1bfaa230ecb268c7b86fa4ac6e7121"
 
 [[package]]
 name = "cc"
-version = "1.0.89"
+version = "1.0.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0ba8f7aaa012f30d5b2861462f6708eccd49c3c39863fe083a308035f63d723"
+checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4"
 dependencies = [
  "jobserver",
  "libc",
+ "once_cell",
 ]
 
 [[package]]
 name = "jobserver"
-version = "0.1.28"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6"
+checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.154"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
 
 [[package]]
 name = "libfuzzer-sys"
@@ -52,7 +53,7 @@ dependencies = [
 
 [[package]]
 name = "masto-id-convert"
-version = "0.0.1-pre.5"
+version = "0.0.1-pre.6"
 dependencies = [
  "atoi_radix10",
  "nanorand",
@@ -81,6 +82,6 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "uuid"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
+checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
diff --git a/lib/post-process/fuzz/Cargo.lock b/lib/post-process/fuzz/Cargo.lock
index 313d19532..5317d00f9 100644
--- a/lib/post-process/fuzz/Cargo.lock
+++ b/lib/post-process/fuzz/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "beef"
@@ -22,12 +22,13 @@ checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1"
 
 [[package]]
 name = "cc"
-version = "1.0.89"
+version = "1.0.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0ba8f7aaa012f30d5b2861462f6708eccd49c3c39863fe083a308035f63d723"
+checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4"
 dependencies = [
  "jobserver",
  "libc",
+ "once_cell",
 ]
 
 [[package]]
@@ -74,9 +75,9 @@ dependencies = [
 
 [[package]]
 name = "jobserver"
-version = "0.1.28"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6"
+checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
 dependencies = [
  "libc",
 ]
@@ -89,9 +90,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.154"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
 
 [[package]]
 name = "libfuzzer-sys"
@@ -145,9 +146,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 
 [[package]]
 name = "pin-utils"
@@ -157,7 +158,7 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "post-process"
-version = "0.0.1-pre.5"
+version = "0.0.1-pre.6"
 dependencies = [
  "logos",
 ]
@@ -173,27 +174,27 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
 
 [[package]]
 name = "slab"
@@ -206,9 +207,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.52"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",