diff --git a/packages/api/src/client/types/app/bsky/actor/defs.ts b/packages/api/src/client/types/app/bsky/actor/defs.ts
index 78cff825671..c18f5618e77 100644
--- a/packages/api/src/client/types/app/bsky/actor/defs.ts
+++ b/packages/api/src/client/types/app/bsky/actor/defs.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as AppBskyGraphDefs from '../graph/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const id = 'app.bsky.actor.defs'
+
 export interface ProfileViewBasic {
   did: string
   handle: string
@@ -21,16 +23,17 @@ export interface ProfileViewBasic {
   [k: string]: unknown
 }
 
-export function isProfileViewBasic(v: unknown): v is ProfileViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileViewBasic'
-  )
+export function isProfileViewBasic(v: unknown): v is ProfileViewBasic & {
+  $type: $Type<'app.bsky.actor.defs', 'profileViewBasic'>
+} {
+  return is$typed(v, id, 'profileViewBasic')
 }
 
-export function validateProfileViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileViewBasic', v)
+export function validateProfileViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileViewBasic`,
+    v,
+  ) as ValidationResult<ProfileViewBasic>
 }
 
 export interface ProfileView {
@@ -47,16 +50,17 @@ export interface ProfileView {
   [k: string]: unknown
 }
 
-export function isProfileView(v: unknown): v is ProfileView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileView'
-  )
+export function isProfileView(
+  v: unknown,
+): v is ProfileView & { $type: $Type<'app.bsky.actor.defs', 'profileView'> } {
+  return is$typed(v, id, 'profileView')
 }
 
-export function validateProfileView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileView', v)
+export function validateProfileView(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileView`,
+    v,
+  ) as ValidationResult<ProfileView>
 }
 
 export interface ProfileViewDetailed {
@@ -79,16 +83,17 @@ export interface ProfileViewDetailed {
   [k: string]: unknown
 }
 
-export function isProfileViewDetailed(v: unknown): v is ProfileViewDetailed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileViewDetailed'
-  )
+export function isProfileViewDetailed(v: unknown): v is ProfileViewDetailed & {
+  $type: $Type<'app.bsky.actor.defs', 'profileViewDetailed'>
+} {
+  return is$typed(v, id, 'profileViewDetailed')
 }
 
-export function validateProfileViewDetailed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileViewDetailed', v)
+export function validateProfileViewDetailed(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileViewDetailed`,
+    v,
+  ) as ValidationResult<ProfileViewDetailed>
 }
 
 export interface ProfileAssociated {
@@ -100,16 +105,17 @@ export interface ProfileAssociated {
   [k: string]: unknown
 }
 
-export function isProfileAssociated(v: unknown): v is ProfileAssociated {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileAssociated'
-  )
+export function isProfileAssociated(v: unknown): v is ProfileAssociated & {
+  $type: $Type<'app.bsky.actor.defs', 'profileAssociated'>
+} {
+  return is$typed(v, id, 'profileAssociated')
 }
 
-export function validateProfileAssociated(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileAssociated', v)
+export function validateProfileAssociated(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileAssociated`,
+    v,
+  ) as ValidationResult<ProfileAssociated>
 }
 
 export interface ProfileAssociatedChat {
@@ -119,16 +125,17 @@ export interface ProfileAssociatedChat {
 
 export function isProfileAssociatedChat(
   v: unknown,
-): v is ProfileAssociatedChat {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileAssociatedChat'
-  )
+): v is ProfileAssociatedChat & {
+  $type: $Type<'app.bsky.actor.defs', 'profileAssociatedChat'>
+} {
+  return is$typed(v, id, 'profileAssociatedChat')
 }
 
-export function validateProfileAssociatedChat(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileAssociatedChat', v)
+export function validateProfileAssociatedChat(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileAssociatedChat`,
+    v,
+  ) as ValidationResult<ProfileAssociatedChat>
 }
 
 /** Metadata about the requesting account's relationship with the subject account. Only has meaningful content for authed requests. */
@@ -144,16 +151,17 @@ export interface ViewerState {
   [k: string]: unknown
 }
 
-export function isViewerState(v: unknown): v is ViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#viewerState'
-  )
+export function isViewerState(
+  v: unknown,
+): v is ViewerState & { $type: $Type<'app.bsky.actor.defs', 'viewerState'> } {
+  return is$typed(v, id, 'viewerState')
 }
 
-export function validateViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#viewerState', v)
+export function validateViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewerState`,
+    v,
+  ) as ValidationResult<ViewerState>
 }
 
 /** The subject's followers whom you also follow */
@@ -163,16 +171,17 @@ export interface KnownFollowers {
   [k: string]: unknown
 }
 
-export function isKnownFollowers(v: unknown): v is KnownFollowers {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#knownFollowers'
-  )
+export function isKnownFollowers(v: unknown): v is KnownFollowers & {
+  $type: $Type<'app.bsky.actor.defs', 'knownFollowers'>
+} {
+  return is$typed(v, id, 'knownFollowers')
 }
 
-export function validateKnownFollowers(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#knownFollowers', v)
+export function validateKnownFollowers(v: unknown) {
+  return lexicons.validate(
+    `${id}#knownFollowers`,
+    v,
+  ) as ValidationResult<KnownFollowers>
 }
 
 export type Preferences = (
@@ -196,16 +205,17 @@ export interface AdultContentPref {
   [k: string]: unknown
 }
 
-export function isAdultContentPref(v: unknown): v is AdultContentPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#adultContentPref'
-  )
+export function isAdultContentPref(v: unknown): v is AdultContentPref & {
+  $type: $Type<'app.bsky.actor.defs', 'adultContentPref'>
+} {
+  return is$typed(v, id, 'adultContentPref')
 }
 
-export function validateAdultContentPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#adultContentPref', v)
+export function validateAdultContentPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#adultContentPref`,
+    v,
+  ) as ValidationResult<AdultContentPref>
 }
 
 export interface ContentLabelPref {
@@ -216,16 +226,17 @@ export interface ContentLabelPref {
   [k: string]: unknown
 }
 
-export function isContentLabelPref(v: unknown): v is ContentLabelPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#contentLabelPref'
-  )
+export function isContentLabelPref(v: unknown): v is ContentLabelPref & {
+  $type: $Type<'app.bsky.actor.defs', 'contentLabelPref'>
+} {
+  return is$typed(v, id, 'contentLabelPref')
 }
 
-export function validateContentLabelPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#contentLabelPref', v)
+export function validateContentLabelPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#contentLabelPref`,
+    v,
+  ) as ValidationResult<ContentLabelPref>
 }
 
 export interface SavedFeed {
@@ -236,16 +247,14 @@ export interface SavedFeed {
   [k: string]: unknown
 }
 
-export function isSavedFeed(v: unknown): v is SavedFeed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeed'
-  )
+export function isSavedFeed(
+  v: unknown,
+): v is SavedFeed & { $type: $Type<'app.bsky.actor.defs', 'savedFeed'> } {
+  return is$typed(v, id, 'savedFeed')
 }
 
-export function validateSavedFeed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeed', v)
+export function validateSavedFeed(v: unknown) {
+  return lexicons.validate(`${id}#savedFeed`, v) as ValidationResult<SavedFeed>
 }
 
 export interface SavedFeedsPrefV2 {
@@ -253,16 +262,17 @@ export interface SavedFeedsPrefV2 {
   [k: string]: unknown
 }
 
-export function isSavedFeedsPrefV2(v: unknown): v is SavedFeedsPrefV2 {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeedsPrefV2'
-  )
+export function isSavedFeedsPrefV2(v: unknown): v is SavedFeedsPrefV2 & {
+  $type: $Type<'app.bsky.actor.defs', 'savedFeedsPrefV2'>
+} {
+  return is$typed(v, id, 'savedFeedsPrefV2')
 }
 
-export function validateSavedFeedsPrefV2(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeedsPrefV2', v)
+export function validateSavedFeedsPrefV2(v: unknown) {
+  return lexicons.validate(
+    `${id}#savedFeedsPrefV2`,
+    v,
+  ) as ValidationResult<SavedFeedsPrefV2>
 }
 
 export interface SavedFeedsPref {
@@ -272,16 +282,17 @@ export interface SavedFeedsPref {
   [k: string]: unknown
 }
 
-export function isSavedFeedsPref(v: unknown): v is SavedFeedsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeedsPref'
-  )
+export function isSavedFeedsPref(v: unknown): v is SavedFeedsPref & {
+  $type: $Type<'app.bsky.actor.defs', 'savedFeedsPref'>
+} {
+  return is$typed(v, id, 'savedFeedsPref')
 }
 
-export function validateSavedFeedsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeedsPref', v)
+export function validateSavedFeedsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#savedFeedsPref`,
+    v,
+  ) as ValidationResult<SavedFeedsPref>
 }
 
 export interface PersonalDetailsPref {
@@ -290,16 +301,17 @@ export interface PersonalDetailsPref {
   [k: string]: unknown
 }
 
-export function isPersonalDetailsPref(v: unknown): v is PersonalDetailsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#personalDetailsPref'
-  )
+export function isPersonalDetailsPref(v: unknown): v is PersonalDetailsPref & {
+  $type: $Type<'app.bsky.actor.defs', 'personalDetailsPref'>
+} {
+  return is$typed(v, id, 'personalDetailsPref')
 }
 
-export function validatePersonalDetailsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#personalDetailsPref', v)
+export function validatePersonalDetailsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#personalDetailsPref`,
+    v,
+  ) as ValidationResult<PersonalDetailsPref>
 }
 
 export interface FeedViewPref {
@@ -318,16 +330,17 @@ export interface FeedViewPref {
   [k: string]: unknown
 }
 
-export function isFeedViewPref(v: unknown): v is FeedViewPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#feedViewPref'
-  )
+export function isFeedViewPref(
+  v: unknown,
+): v is FeedViewPref & { $type: $Type<'app.bsky.actor.defs', 'feedViewPref'> } {
+  return is$typed(v, id, 'feedViewPref')
 }
 
-export function validateFeedViewPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#feedViewPref', v)
+export function validateFeedViewPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#feedViewPref`,
+    v,
+  ) as ValidationResult<FeedViewPref>
 }
 
 export interface ThreadViewPref {
@@ -344,16 +357,17 @@ export interface ThreadViewPref {
   [k: string]: unknown
 }
 
-export function isThreadViewPref(v: unknown): v is ThreadViewPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#threadViewPref'
-  )
+export function isThreadViewPref(v: unknown): v is ThreadViewPref & {
+  $type: $Type<'app.bsky.actor.defs', 'threadViewPref'>
+} {
+  return is$typed(v, id, 'threadViewPref')
 }
 
-export function validateThreadViewPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#threadViewPref', v)
+export function validateThreadViewPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#threadViewPref`,
+    v,
+  ) as ValidationResult<ThreadViewPref>
 }
 
 export interface InterestsPref {
@@ -362,16 +376,17 @@ export interface InterestsPref {
   [k: string]: unknown
 }
 
-export function isInterestsPref(v: unknown): v is InterestsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#interestsPref'
-  )
+export function isInterestsPref(v: unknown): v is InterestsPref & {
+  $type: $Type<'app.bsky.actor.defs', 'interestsPref'>
+} {
+  return is$typed(v, id, 'interestsPref')
 }
 
-export function validateInterestsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#interestsPref', v)
+export function validateInterestsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#interestsPref`,
+    v,
+  ) as ValidationResult<InterestsPref>
 }
 
 export type MutedWordTarget = 'content' | 'tag' | (string & {})
@@ -390,16 +405,14 @@ export interface MutedWord {
   [k: string]: unknown
 }
 
-export function isMutedWord(v: unknown): v is MutedWord {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#mutedWord'
-  )
+export function isMutedWord(
+  v: unknown,
+): v is MutedWord & { $type: $Type<'app.bsky.actor.defs', 'mutedWord'> } {
+  return is$typed(v, id, 'mutedWord')
 }
 
-export function validateMutedWord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#mutedWord', v)
+export function validateMutedWord(v: unknown) {
+  return lexicons.validate(`${id}#mutedWord`, v) as ValidationResult<MutedWord>
 }
 
 export interface MutedWordsPref {
@@ -408,16 +421,17 @@ export interface MutedWordsPref {
   [k: string]: unknown
 }
 
-export function isMutedWordsPref(v: unknown): v is MutedWordsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#mutedWordsPref'
-  )
+export function isMutedWordsPref(v: unknown): v is MutedWordsPref & {
+  $type: $Type<'app.bsky.actor.defs', 'mutedWordsPref'>
+} {
+  return is$typed(v, id, 'mutedWordsPref')
 }
 
-export function validateMutedWordsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#mutedWordsPref', v)
+export function validateMutedWordsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#mutedWordsPref`,
+    v,
+  ) as ValidationResult<MutedWordsPref>
 }
 
 export interface HiddenPostsPref {
@@ -426,16 +440,17 @@ export interface HiddenPostsPref {
   [k: string]: unknown
 }
 
-export function isHiddenPostsPref(v: unknown): v is HiddenPostsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#hiddenPostsPref'
-  )
+export function isHiddenPostsPref(v: unknown): v is HiddenPostsPref & {
+  $type: $Type<'app.bsky.actor.defs', 'hiddenPostsPref'>
+} {
+  return is$typed(v, id, 'hiddenPostsPref')
 }
 
-export function validateHiddenPostsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#hiddenPostsPref', v)
+export function validateHiddenPostsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#hiddenPostsPref`,
+    v,
+  ) as ValidationResult<HiddenPostsPref>
 }
 
 export interface LabelersPref {
@@ -443,16 +458,17 @@ export interface LabelersPref {
   [k: string]: unknown
 }
 
-export function isLabelersPref(v: unknown): v is LabelersPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#labelersPref'
-  )
+export function isLabelersPref(
+  v: unknown,
+): v is LabelersPref & { $type: $Type<'app.bsky.actor.defs', 'labelersPref'> } {
+  return is$typed(v, id, 'labelersPref')
 }
 
-export function validateLabelersPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#labelersPref', v)
+export function validateLabelersPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelersPref`,
+    v,
+  ) as ValidationResult<LabelersPref>
 }
 
 export interface LabelerPrefItem {
@@ -460,16 +476,17 @@ export interface LabelerPrefItem {
   [k: string]: unknown
 }
 
-export function isLabelerPrefItem(v: unknown): v is LabelerPrefItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#labelerPrefItem'
-  )
+export function isLabelerPrefItem(v: unknown): v is LabelerPrefItem & {
+  $type: $Type<'app.bsky.actor.defs', 'labelerPrefItem'>
+} {
+  return is$typed(v, id, 'labelerPrefItem')
 }
 
-export function validateLabelerPrefItem(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#labelerPrefItem', v)
+export function validateLabelerPrefItem(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerPrefItem`,
+    v,
+  ) as ValidationResult<LabelerPrefItem>
 }
 
 /** A grab bag of state that's specific to the bsky.app program. Third-party apps shouldn't use this. */
@@ -482,16 +499,17 @@ export interface BskyAppStatePref {
   [k: string]: unknown
 }
 
-export function isBskyAppStatePref(v: unknown): v is BskyAppStatePref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#bskyAppStatePref'
-  )
+export function isBskyAppStatePref(v: unknown): v is BskyAppStatePref & {
+  $type: $Type<'app.bsky.actor.defs', 'bskyAppStatePref'>
+} {
+  return is$typed(v, id, 'bskyAppStatePref')
 }
 
-export function validateBskyAppStatePref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#bskyAppStatePref', v)
+export function validateBskyAppStatePref(v: unknown) {
+  return lexicons.validate(
+    `${id}#bskyAppStatePref`,
+    v,
+  ) as ValidationResult<BskyAppStatePref>
 }
 
 /** If set, an active progress guide. Once completed, can be set to undefined. Should have unspecced fields tracking progress. */
@@ -500,16 +518,19 @@ export interface BskyAppProgressGuide {
   [k: string]: unknown
 }
 
-export function isBskyAppProgressGuide(v: unknown): v is BskyAppProgressGuide {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#bskyAppProgressGuide'
-  )
+export function isBskyAppProgressGuide(
+  v: unknown,
+): v is BskyAppProgressGuide & {
+  $type: $Type<'app.bsky.actor.defs', 'bskyAppProgressGuide'>
+} {
+  return is$typed(v, id, 'bskyAppProgressGuide')
 }
 
-export function validateBskyAppProgressGuide(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#bskyAppProgressGuide', v)
+export function validateBskyAppProgressGuide(v: unknown) {
+  return lexicons.validate(
+    `${id}#bskyAppProgressGuide`,
+    v,
+  ) as ValidationResult<BskyAppProgressGuide>
 }
 
 /** A new user experiences (NUX) storage object */
@@ -523,12 +544,12 @@ export interface Nux {
   [k: string]: unknown
 }
 
-export function isNux(v: unknown): v is Nux {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.actor.defs#nux'
-  )
+export function isNux(
+  v: unknown,
+): v is Nux & { $type: $Type<'app.bsky.actor.defs', 'nux'> } {
+  return is$typed(v, id, 'nux')
 }
 
-export function validateNux(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#nux', v)
+export function validateNux(v: unknown) {
+  return lexicons.validate(`${id}#nux`, v) as ValidationResult<Nux>
 }
diff --git a/packages/api/src/client/types/app/bsky/actor/getPreferences.ts b/packages/api/src/client/types/app/bsky/actor/getPreferences.ts
index 6cc35cc3c62..31e7e98c29d 100644
--- a/packages/api/src/client/types/app/bsky/actor/getPreferences.ts
+++ b/packages/api/src/client/types/app/bsky/actor/getPreferences.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from './defs'
 
+const id = 'app.bsky.actor.getPreferences'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/api/src/client/types/app/bsky/actor/getProfile.ts b/packages/api/src/client/types/app/bsky/actor/getProfile.ts
index 13618b6c2f7..6b9b7bc9759 100644
--- a/packages/api/src/client/types/app/bsky/actor/getProfile.ts
+++ b/packages/api/src/client/types/app/bsky/actor/getProfile.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from './defs'
 
+const id = 'app.bsky.actor.getProfile'
+
 export interface QueryParams {
   /** Handle or DID of account to fetch profile of. */
   actor: string
diff --git a/packages/api/src/client/types/app/bsky/actor/getProfiles.ts b/packages/api/src/client/types/app/bsky/actor/getProfiles.ts
index 2207218ac69..cb37b97f1cf 100644
--- a/packages/api/src/client/types/app/bsky/actor/getProfiles.ts
+++ b/packages/api/src/client/types/app/bsky/actor/getProfiles.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from './defs'
 
+const id = 'app.bsky.actor.getProfiles'
+
 export interface QueryParams {
   actors: string[]
 }
diff --git a/packages/api/src/client/types/app/bsky/actor/getSuggestions.ts b/packages/api/src/client/types/app/bsky/actor/getSuggestions.ts
index 48553fd1b85..972adadf066 100644
--- a/packages/api/src/client/types/app/bsky/actor/getSuggestions.ts
+++ b/packages/api/src/client/types/app/bsky/actor/getSuggestions.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from './defs'
 
+const id = 'app.bsky.actor.getSuggestions'
+
 export interface QueryParams {
   limit?: number
   cursor?: string
diff --git a/packages/api/src/client/types/app/bsky/actor/profile.ts b/packages/api/src/client/types/app/bsky/actor/profile.ts
index c109e93f9ab..9463df7cd24 100644
--- a/packages/api/src/client/types/app/bsky/actor/profile.ts
+++ b/packages/api/src/client/types/app/bsky/actor/profile.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const id = 'app.bsky.actor.profile'
+
 export interface Record {
   displayName?: string
   /** Free-form profile description text. */
@@ -25,15 +27,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.actor.profile#main' ||
-      v.$type === 'app.bsky.actor.profile')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.actor.profile', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.profile#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/api/src/client/types/app/bsky/actor/putPreferences.ts b/packages/api/src/client/types/app/bsky/actor/putPreferences.ts
index 834b1bd247c..05f013edf7f 100644
--- a/packages/api/src/client/types/app/bsky/actor/putPreferences.ts
+++ b/packages/api/src/client/types/app/bsky/actor/putPreferences.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from './defs'
 
+const id = 'app.bsky.actor.putPreferences'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/api/src/client/types/app/bsky/actor/searchActors.ts b/packages/api/src/client/types/app/bsky/actor/searchActors.ts
index bcbde2b7bfb..d9b695f3e07 100644
--- a/packages/api/src/client/types/app/bsky/actor/searchActors.ts
+++ b/packages/api/src/client/types/app/bsky/actor/searchActors.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from './defs'
 
+const id = 'app.bsky.actor.searchActors'
+
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead. */
   term?: string
diff --git a/packages/api/src/client/types/app/bsky/actor/searchActorsTypeahead.ts b/packages/api/src/client/types/app/bsky/actor/searchActorsTypeahead.ts
index abed0289f27..69ca089e356 100644
--- a/packages/api/src/client/types/app/bsky/actor/searchActorsTypeahead.ts
+++ b/packages/api/src/client/types/app/bsky/actor/searchActorsTypeahead.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from './defs'
 
+const id = 'app.bsky.actor.searchActorsTypeahead'
+
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead. */
   term?: string
diff --git a/packages/api/src/client/types/app/bsky/embed/defs.ts b/packages/api/src/client/types/app/bsky/embed/defs.ts
index b7b753d65f6..662d2ea7b80 100644
--- a/packages/api/src/client/types/app/bsky/embed/defs.ts
+++ b/packages/api/src/client/types/app/bsky/embed/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'app.bsky.embed.defs'
 
 /** width:height represents an aspect ratio. It may be approximate, and may not correspond to absolute dimensions in any given unit. */
 export interface AspectRatio {
@@ -13,14 +15,15 @@ export interface AspectRatio {
   [k: string]: unknown
 }
 
-export function isAspectRatio(v: unknown): v is AspectRatio {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.defs#aspectRatio'
-  )
+export function isAspectRatio(
+  v: unknown,
+): v is AspectRatio & { $type: $Type<'app.bsky.embed.defs', 'aspectRatio'> } {
+  return is$typed(v, id, 'aspectRatio')
 }
 
-export function validateAspectRatio(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.defs#aspectRatio', v)
+export function validateAspectRatio(v: unknown) {
+  return lexicons.validate(
+    `${id}#aspectRatio`,
+    v,
+  ) as ValidationResult<AspectRatio>
 }
diff --git a/packages/api/src/client/types/app/bsky/embed/external.ts b/packages/api/src/client/types/app/bsky/embed/external.ts
index 5832cbb3987..0ca9b292aa2 100644
--- a/packages/api/src/client/types/app/bsky/embed/external.ts
+++ b/packages/api/src/client/types/app/bsky/embed/external.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'app.bsky.embed.external'
 
 /** A representation of some externally linked content (eg, a URL and 'card'), embedded in a Bluesky record (eg, a post). */
 export interface Main {
@@ -12,17 +14,14 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.external#main' ||
-      v.$type === 'app.bsky.embed.external')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: $Type<'app.bsky.embed.external', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface External {
@@ -33,16 +32,14 @@ export interface External {
   [k: string]: unknown
 }
 
-export function isExternal(v: unknown): v is External {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#external'
-  )
+export function isExternal(
+  v: unknown,
+): v is External & { $type: $Type<'app.bsky.embed.external', 'external'> } {
+  return is$typed(v, id, 'external')
 }
 
-export function validateExternal(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#external', v)
+export function validateExternal(v: unknown) {
+  return lexicons.validate(`${id}#external`, v) as ValidationResult<External>
 }
 
 export interface View {
@@ -50,16 +47,14 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: $Type<'app.bsky.embed.external', 'view'> } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
 
 export interface ViewExternal {
@@ -70,14 +65,15 @@ export interface ViewExternal {
   [k: string]: unknown
 }
 
-export function isViewExternal(v: unknown): v is ViewExternal {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#viewExternal'
-  )
+export function isViewExternal(v: unknown): v is ViewExternal & {
+  $type: $Type<'app.bsky.embed.external', 'viewExternal'>
+} {
+  return is$typed(v, id, 'viewExternal')
 }
 
-export function validateViewExternal(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#viewExternal', v)
+export function validateViewExternal(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewExternal`,
+    v,
+  ) as ValidationResult<ViewExternal>
 }
diff --git a/packages/api/src/client/types/app/bsky/embed/images.ts b/packages/api/src/client/types/app/bsky/embed/images.ts
index 886ad7c5c5b..81fc960b1ab 100644
--- a/packages/api/src/client/types/app/bsky/embed/images.ts
+++ b/packages/api/src/client/types/app/bsky/embed/images.ts
@@ -2,27 +2,26 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyEmbedDefs from './defs'
 
+const id = 'app.bsky.embed.images'
+
 export interface Main {
   images: Image[]
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.images#main' ||
-      v.$type === 'app.bsky.embed.images')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: $Type<'app.bsky.embed.images', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface Image {
@@ -33,14 +32,14 @@ export interface Image {
   [k: string]: unknown
 }
 
-export function isImage(v: unknown): v is Image {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.images#image'
-  )
+export function isImage(
+  v: unknown,
+): v is Image & { $type: $Type<'app.bsky.embed.images', 'image'> } {
+  return is$typed(v, id, 'image')
 }
 
-export function validateImage(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#image', v)
+export function validateImage(v: unknown) {
+  return lexicons.validate(`${id}#image`, v) as ValidationResult<Image>
 }
 
 export interface View {
@@ -48,14 +47,14 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.images#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: $Type<'app.bsky.embed.images', 'view'> } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
 
 export interface ViewImage {
@@ -69,14 +68,12 @@ export interface ViewImage {
   [k: string]: unknown
 }
 
-export function isViewImage(v: unknown): v is ViewImage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.images#viewImage'
-  )
+export function isViewImage(
+  v: unknown,
+): v is ViewImage & { $type: $Type<'app.bsky.embed.images', 'viewImage'> } {
+  return is$typed(v, id, 'viewImage')
 }
 
-export function validateViewImage(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#viewImage', v)
+export function validateViewImage(v: unknown) {
+  return lexicons.validate(`${id}#viewImage`, v) as ValidationResult<ViewImage>
 }
diff --git a/packages/api/src/client/types/app/bsky/embed/record.ts b/packages/api/src/client/types/app/bsky/embed/record.ts
index a3744c29246..5b2bc9a62b6 100644
--- a/packages/api/src/client/types/app/bsky/embed/record.ts
+++ b/packages/api/src/client/types/app/bsky/embed/record.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 import * as AppBskyFeedDefs from '../feed/defs'
 import * as AppBskyGraphDefs from '../graph/defs'
@@ -16,22 +16,21 @@ import * as AppBskyEmbedVideo from './video'
 import * as AppBskyEmbedExternal from './external'
 import * as AppBskyEmbedRecordWithMedia from './recordWithMedia'
 
+const id = 'app.bsky.embed.record'
+
 export interface Main {
   record: ComAtprotoRepoStrongRef.Main
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.record#main' ||
-      v.$type === 'app.bsky.embed.record')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: $Type<'app.bsky.embed.record', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface View {
@@ -48,14 +47,14 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.record#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: $Type<'app.bsky.embed.record', 'view'> } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
 
 export interface ViewRecord {
@@ -81,16 +80,17 @@ export interface ViewRecord {
   [k: string]: unknown
 }
 
-export function isViewRecord(v: unknown): v is ViewRecord {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewRecord'
-  )
+export function isViewRecord(
+  v: unknown,
+): v is ViewRecord & { $type: $Type<'app.bsky.embed.record', 'viewRecord'> } {
+  return is$typed(v, id, 'viewRecord')
 }
 
-export function validateViewRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewRecord', v)
+export function validateViewRecord(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewRecord`,
+    v,
+  ) as ValidationResult<ViewRecord>
 }
 
 export interface ViewNotFound {
@@ -99,16 +99,17 @@ export interface ViewNotFound {
   [k: string]: unknown
 }
 
-export function isViewNotFound(v: unknown): v is ViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewNotFound'
-  )
+export function isViewNotFound(v: unknown): v is ViewNotFound & {
+  $type: $Type<'app.bsky.embed.record', 'viewNotFound'>
+} {
+  return is$typed(v, id, 'viewNotFound')
 }
 
-export function validateViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewNotFound', v)
+export function validateViewNotFound(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewNotFound`,
+    v,
+  ) as ValidationResult<ViewNotFound>
 }
 
 export interface ViewBlocked {
@@ -118,16 +119,17 @@ export interface ViewBlocked {
   [k: string]: unknown
 }
 
-export function isViewBlocked(v: unknown): v is ViewBlocked {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewBlocked'
-  )
+export function isViewBlocked(
+  v: unknown,
+): v is ViewBlocked & { $type: $Type<'app.bsky.embed.record', 'viewBlocked'> } {
+  return is$typed(v, id, 'viewBlocked')
 }
 
-export function validateViewBlocked(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewBlocked', v)
+export function validateViewBlocked(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewBlocked`,
+    v,
+  ) as ValidationResult<ViewBlocked>
 }
 
 export interface ViewDetached {
@@ -136,14 +138,15 @@ export interface ViewDetached {
   [k: string]: unknown
 }
 
-export function isViewDetached(v: unknown): v is ViewDetached {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewDetached'
-  )
+export function isViewDetached(v: unknown): v is ViewDetached & {
+  $type: $Type<'app.bsky.embed.record', 'viewDetached'>
+} {
+  return is$typed(v, id, 'viewDetached')
 }
 
-export function validateViewDetached(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewDetached', v)
+export function validateViewDetached(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewDetached`,
+    v,
+  ) as ValidationResult<ViewDetached>
 }
diff --git a/packages/api/src/client/types/app/bsky/embed/recordWithMedia.ts b/packages/api/src/client/types/app/bsky/embed/recordWithMedia.ts
index 2b2b3ae6251..7c382d41853 100644
--- a/packages/api/src/client/types/app/bsky/embed/recordWithMedia.ts
+++ b/packages/api/src/client/types/app/bsky/embed/recordWithMedia.ts
@@ -2,14 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyEmbedRecord from './record'
 import * as AppBskyEmbedImages from './images'
 import * as AppBskyEmbedVideo from './video'
 import * as AppBskyEmbedExternal from './external'
 
+const id = 'app.bsky.embed.recordWithMedia'
+
 export interface Main {
   record: AppBskyEmbedRecord.Main
   media:
@@ -20,17 +22,14 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.recordWithMedia#main' ||
-      v.$type === 'app.bsky.embed.recordWithMedia')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: $Type<'app.bsky.embed.recordWithMedia', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.recordWithMedia#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface View {
@@ -43,14 +42,12 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.recordWithMedia#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: $Type<'app.bsky.embed.recordWithMedia', 'view'> } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.recordWithMedia#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
diff --git a/packages/api/src/client/types/app/bsky/embed/video.ts b/packages/api/src/client/types/app/bsky/embed/video.ts
index 2be451b85ed..eefabf0f660 100644
--- a/packages/api/src/client/types/app/bsky/embed/video.ts
+++ b/packages/api/src/client/types/app/bsky/embed/video.ts
@@ -2,11 +2,13 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyEmbedDefs from './defs'
 
+const id = 'app.bsky.embed.video'
+
 export interface Main {
   video: BlobRef
   captions?: Caption[]
@@ -16,17 +18,14 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.video#main' ||
-      v.$type === 'app.bsky.embed.video')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: $Type<'app.bsky.embed.video', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface Caption {
@@ -35,16 +34,14 @@ export interface Caption {
   [k: string]: unknown
 }
 
-export function isCaption(v: unknown): v is Caption {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.video#caption'
-  )
+export function isCaption(
+  v: unknown,
+): v is Caption & { $type: $Type<'app.bsky.embed.video', 'caption'> } {
+  return is$typed(v, id, 'caption')
 }
 
-export function validateCaption(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#caption', v)
+export function validateCaption(v: unknown) {
+  return lexicons.validate(`${id}#caption`, v) as ValidationResult<Caption>
 }
 
 export interface View {
@@ -56,12 +53,12 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.video#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: $Type<'app.bsky.embed.video', 'view'> } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
diff --git a/packages/api/src/client/types/app/bsky/feed/defs.ts b/packages/api/src/client/types/app/bsky/feed/defs.ts
index bc50067c1da..bb2693d18dc 100644
--- a/packages/api/src/client/types/app/bsky/feed/defs.ts
+++ b/packages/api/src/client/types/app/bsky/feed/defs.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as AppBskyEmbedImages from '../embed/images'
 import * as AppBskyEmbedVideo from '../embed/video'
@@ -15,6 +15,8 @@ import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as AppBskyGraphDefs from '../graph/defs'
 
+const id = 'app.bsky.feed.defs'
+
 export interface PostView {
   uri: string
   cid: string
@@ -38,14 +40,14 @@ export interface PostView {
   [k: string]: unknown
 }
 
-export function isPostView(v: unknown): v is PostView {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.defs#postView'
-  )
+export function isPostView(
+  v: unknown,
+): v is PostView & { $type: $Type<'app.bsky.feed.defs', 'postView'> } {
+  return is$typed(v, id, 'postView')
 }
 
-export function validatePostView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#postView', v)
+export function validatePostView(v: unknown) {
+  return lexicons.validate(`${id}#postView`, v) as ValidationResult<PostView>
 }
 
 /** Metadata about the requesting account's relationship with the subject content. Only has meaningful content for authed requests. */
@@ -59,16 +61,17 @@ export interface ViewerState {
   [k: string]: unknown
 }
 
-export function isViewerState(v: unknown): v is ViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#viewerState'
-  )
+export function isViewerState(
+  v: unknown,
+): v is ViewerState & { $type: $Type<'app.bsky.feed.defs', 'viewerState'> } {
+  return is$typed(v, id, 'viewerState')
 }
 
-export function validateViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#viewerState', v)
+export function validateViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewerState`,
+    v,
+  ) as ValidationResult<ViewerState>
 }
 
 export interface FeedViewPost {
@@ -80,16 +83,17 @@ export interface FeedViewPost {
   [k: string]: unknown
 }
 
-export function isFeedViewPost(v: unknown): v is FeedViewPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#feedViewPost'
-  )
+export function isFeedViewPost(
+  v: unknown,
+): v is FeedViewPost & { $type: $Type<'app.bsky.feed.defs', 'feedViewPost'> } {
+  return is$typed(v, id, 'feedViewPost')
 }
 
-export function validateFeedViewPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#feedViewPost', v)
+export function validateFeedViewPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#feedViewPost`,
+    v,
+  ) as ValidationResult<FeedViewPost>
 }
 
 export interface ReplyRef {
@@ -107,14 +111,14 @@ export interface ReplyRef {
   [k: string]: unknown
 }
 
-export function isReplyRef(v: unknown): v is ReplyRef {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.defs#replyRef'
-  )
+export function isReplyRef(
+  v: unknown,
+): v is ReplyRef & { $type: $Type<'app.bsky.feed.defs', 'replyRef'> } {
+  return is$typed(v, id, 'replyRef')
 }
 
-export function validateReplyRef(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#replyRef', v)
+export function validateReplyRef(v: unknown) {
+  return lexicons.validate(`${id}#replyRef`, v) as ValidationResult<ReplyRef>
 }
 
 export interface ReasonRepost {
@@ -123,32 +127,31 @@ export interface ReasonRepost {
   [k: string]: unknown
 }
 
-export function isReasonRepost(v: unknown): v is ReasonRepost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#reasonRepost'
-  )
+export function isReasonRepost(
+  v: unknown,
+): v is ReasonRepost & { $type: $Type<'app.bsky.feed.defs', 'reasonRepost'> } {
+  return is$typed(v, id, 'reasonRepost')
 }
 
-export function validateReasonRepost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#reasonRepost', v)
+export function validateReasonRepost(v: unknown) {
+  return lexicons.validate(
+    `${id}#reasonRepost`,
+    v,
+  ) as ValidationResult<ReasonRepost>
 }
 
 export interface ReasonPin {
   [k: string]: unknown
 }
 
-export function isReasonPin(v: unknown): v is ReasonPin {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#reasonPin'
-  )
+export function isReasonPin(
+  v: unknown,
+): v is ReasonPin & { $type: $Type<'app.bsky.feed.defs', 'reasonPin'> } {
+  return is$typed(v, id, 'reasonPin')
 }
 
-export function validateReasonPin(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#reasonPin', v)
+export function validateReasonPin(v: unknown) {
+  return lexicons.validate(`${id}#reasonPin`, v) as ValidationResult<ReasonPin>
 }
 
 export interface ThreadViewPost {
@@ -167,16 +170,17 @@ export interface ThreadViewPost {
   [k: string]: unknown
 }
 
-export function isThreadViewPost(v: unknown): v is ThreadViewPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#threadViewPost'
-  )
+export function isThreadViewPost(v: unknown): v is ThreadViewPost & {
+  $type: $Type<'app.bsky.feed.defs', 'threadViewPost'>
+} {
+  return is$typed(v, id, 'threadViewPost')
 }
 
-export function validateThreadViewPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#threadViewPost', v)
+export function validateThreadViewPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#threadViewPost`,
+    v,
+  ) as ValidationResult<ThreadViewPost>
 }
 
 export interface NotFoundPost {
@@ -185,16 +189,17 @@ export interface NotFoundPost {
   [k: string]: unknown
 }
 
-export function isNotFoundPost(v: unknown): v is NotFoundPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#notFoundPost'
-  )
+export function isNotFoundPost(
+  v: unknown,
+): v is NotFoundPost & { $type: $Type<'app.bsky.feed.defs', 'notFoundPost'> } {
+  return is$typed(v, id, 'notFoundPost')
 }
 
-export function validateNotFoundPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#notFoundPost', v)
+export function validateNotFoundPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#notFoundPost`,
+    v,
+  ) as ValidationResult<NotFoundPost>
 }
 
 export interface BlockedPost {
@@ -204,16 +209,17 @@ export interface BlockedPost {
   [k: string]: unknown
 }
 
-export function isBlockedPost(v: unknown): v is BlockedPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#blockedPost'
-  )
+export function isBlockedPost(
+  v: unknown,
+): v is BlockedPost & { $type: $Type<'app.bsky.feed.defs', 'blockedPost'> } {
+  return is$typed(v, id, 'blockedPost')
 }
 
-export function validateBlockedPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#blockedPost', v)
+export function validateBlockedPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#blockedPost`,
+    v,
+  ) as ValidationResult<BlockedPost>
 }
 
 export interface BlockedAuthor {
@@ -222,16 +228,17 @@ export interface BlockedAuthor {
   [k: string]: unknown
 }
 
-export function isBlockedAuthor(v: unknown): v is BlockedAuthor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#blockedAuthor'
-  )
+export function isBlockedAuthor(v: unknown): v is BlockedAuthor & {
+  $type: $Type<'app.bsky.feed.defs', 'blockedAuthor'>
+} {
+  return is$typed(v, id, 'blockedAuthor')
 }
 
-export function validateBlockedAuthor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#blockedAuthor', v)
+export function validateBlockedAuthor(v: unknown) {
+  return lexicons.validate(
+    `${id}#blockedAuthor`,
+    v,
+  ) as ValidationResult<BlockedAuthor>
 }
 
 export interface GeneratorView {
@@ -251,16 +258,17 @@ export interface GeneratorView {
   [k: string]: unknown
 }
 
-export function isGeneratorView(v: unknown): v is GeneratorView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#generatorView'
-  )
+export function isGeneratorView(v: unknown): v is GeneratorView & {
+  $type: $Type<'app.bsky.feed.defs', 'generatorView'>
+} {
+  return is$typed(v, id, 'generatorView')
 }
 
-export function validateGeneratorView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#generatorView', v)
+export function validateGeneratorView(v: unknown) {
+  return lexicons.validate(
+    `${id}#generatorView`,
+    v,
+  ) as ValidationResult<GeneratorView>
 }
 
 export interface GeneratorViewerState {
@@ -268,16 +276,19 @@ export interface GeneratorViewerState {
   [k: string]: unknown
 }
 
-export function isGeneratorViewerState(v: unknown): v is GeneratorViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#generatorViewerState'
-  )
+export function isGeneratorViewerState(
+  v: unknown,
+): v is GeneratorViewerState & {
+  $type: $Type<'app.bsky.feed.defs', 'generatorViewerState'>
+} {
+  return is$typed(v, id, 'generatorViewerState')
 }
 
-export function validateGeneratorViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#generatorViewerState', v)
+export function validateGeneratorViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#generatorViewerState`,
+    v,
+  ) as ValidationResult<GeneratorViewerState>
 }
 
 export interface SkeletonFeedPost {
@@ -291,16 +302,17 @@ export interface SkeletonFeedPost {
   [k: string]: unknown
 }
 
-export function isSkeletonFeedPost(v: unknown): v is SkeletonFeedPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonFeedPost'
-  )
+export function isSkeletonFeedPost(v: unknown): v is SkeletonFeedPost & {
+  $type: $Type<'app.bsky.feed.defs', 'skeletonFeedPost'>
+} {
+  return is$typed(v, id, 'skeletonFeedPost')
 }
 
-export function validateSkeletonFeedPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonFeedPost', v)
+export function validateSkeletonFeedPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonFeedPost`,
+    v,
+  ) as ValidationResult<SkeletonFeedPost>
 }
 
 export interface SkeletonReasonRepost {
@@ -308,32 +320,36 @@ export interface SkeletonReasonRepost {
   [k: string]: unknown
 }
 
-export function isSkeletonReasonRepost(v: unknown): v is SkeletonReasonRepost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonReasonRepost'
-  )
+export function isSkeletonReasonRepost(
+  v: unknown,
+): v is SkeletonReasonRepost & {
+  $type: $Type<'app.bsky.feed.defs', 'skeletonReasonRepost'>
+} {
+  return is$typed(v, id, 'skeletonReasonRepost')
 }
 
-export function validateSkeletonReasonRepost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonReasonRepost', v)
+export function validateSkeletonReasonRepost(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonReasonRepost`,
+    v,
+  ) as ValidationResult<SkeletonReasonRepost>
 }
 
 export interface SkeletonReasonPin {
   [k: string]: unknown
 }
 
-export function isSkeletonReasonPin(v: unknown): v is SkeletonReasonPin {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonReasonPin'
-  )
+export function isSkeletonReasonPin(v: unknown): v is SkeletonReasonPin & {
+  $type: $Type<'app.bsky.feed.defs', 'skeletonReasonPin'>
+} {
+  return is$typed(v, id, 'skeletonReasonPin')
 }
 
-export function validateSkeletonReasonPin(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonReasonPin', v)
+export function validateSkeletonReasonPin(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonReasonPin`,
+    v,
+  ) as ValidationResult<SkeletonReasonPin>
 }
 
 export interface ThreadgateView {
@@ -344,16 +360,17 @@ export interface ThreadgateView {
   [k: string]: unknown
 }
 
-export function isThreadgateView(v: unknown): v is ThreadgateView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#threadgateView'
-  )
+export function isThreadgateView(v: unknown): v is ThreadgateView & {
+  $type: $Type<'app.bsky.feed.defs', 'threadgateView'>
+} {
+  return is$typed(v, id, 'threadgateView')
 }
 
-export function validateThreadgateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#threadgateView', v)
+export function validateThreadgateView(v: unknown) {
+  return lexicons.validate(
+    `${id}#threadgateView`,
+    v,
+  ) as ValidationResult<ThreadgateView>
 }
 
 export interface Interaction {
@@ -377,39 +394,40 @@ export interface Interaction {
   [k: string]: unknown
 }
 
-export function isInteraction(v: unknown): v is Interaction {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#interaction'
-  )
+export function isInteraction(
+  v: unknown,
+): v is Interaction & { $type: $Type<'app.bsky.feed.defs', 'interaction'> } {
+  return is$typed(v, id, 'interaction')
 }
 
-export function validateInteraction(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#interaction', v)
+export function validateInteraction(v: unknown) {
+  return lexicons.validate(
+    `${id}#interaction`,
+    v,
+  ) as ValidationResult<Interaction>
 }
 
 /** Request that less content like the given feed item be shown in the feed */
-export const REQUESTLESS = 'app.bsky.feed.defs#requestLess'
+export const REQUESTLESS = `${id}#requestLess`
 /** Request that more content like the given feed item be shown in the feed */
-export const REQUESTMORE = 'app.bsky.feed.defs#requestMore'
+export const REQUESTMORE = `${id}#requestMore`
 /** User clicked through to the feed item */
-export const CLICKTHROUGHITEM = 'app.bsky.feed.defs#clickthroughItem'
+export const CLICKTHROUGHITEM = `${id}#clickthroughItem`
 /** User clicked through to the author of the feed item */
-export const CLICKTHROUGHAUTHOR = 'app.bsky.feed.defs#clickthroughAuthor'
+export const CLICKTHROUGHAUTHOR = `${id}#clickthroughAuthor`
 /** User clicked through to the reposter of the feed item */
-export const CLICKTHROUGHREPOSTER = 'app.bsky.feed.defs#clickthroughReposter'
+export const CLICKTHROUGHREPOSTER = `${id}#clickthroughReposter`
 /** User clicked through to the embedded content of the feed item */
-export const CLICKTHROUGHEMBED = 'app.bsky.feed.defs#clickthroughEmbed'
+export const CLICKTHROUGHEMBED = `${id}#clickthroughEmbed`
 /** Feed item was seen by user */
-export const INTERACTIONSEEN = 'app.bsky.feed.defs#interactionSeen'
+export const INTERACTIONSEEN = `${id}#interactionSeen`
 /** User liked the feed item */
-export const INTERACTIONLIKE = 'app.bsky.feed.defs#interactionLike'
+export const INTERACTIONLIKE = `${id}#interactionLike`
 /** User reposted the feed item */
-export const INTERACTIONREPOST = 'app.bsky.feed.defs#interactionRepost'
+export const INTERACTIONREPOST = `${id}#interactionRepost`
 /** User replied to the feed item */
-export const INTERACTIONREPLY = 'app.bsky.feed.defs#interactionReply'
+export const INTERACTIONREPLY = `${id}#interactionReply`
 /** User quoted the feed item */
-export const INTERACTIONQUOTE = 'app.bsky.feed.defs#interactionQuote'
+export const INTERACTIONQUOTE = `${id}#interactionQuote`
 /** User shared the feed item */
-export const INTERACTIONSHARE = 'app.bsky.feed.defs#interactionShare'
+export const INTERACTIONSHARE = `${id}#interactionShare`
diff --git a/packages/api/src/client/types/app/bsky/feed/describeFeedGenerator.ts b/packages/api/src/client/types/app/bsky/feed/describeFeedGenerator.ts
index b974f496144..81e845df856 100644
--- a/packages/api/src/client/types/app/bsky/feed/describeFeedGenerator.ts
+++ b/packages/api/src/client/types/app/bsky/feed/describeFeedGenerator.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'app.bsky.feed.describeFeedGenerator'
 
 export interface QueryParams {}
 
@@ -38,16 +40,14 @@ export interface Feed {
   [k: string]: unknown
 }
 
-export function isFeed(v: unknown): v is Feed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.describeFeedGenerator#feed'
-  )
+export function isFeed(
+  v: unknown,
+): v is Feed & { $type: $Type<'app.bsky.feed.describeFeedGenerator', 'feed'> } {
+  return is$typed(v, id, 'feed')
 }
 
-export function validateFeed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.describeFeedGenerator#feed', v)
+export function validateFeed(v: unknown) {
+  return lexicons.validate(`${id}#feed`, v) as ValidationResult<Feed>
 }
 
 export interface Links {
@@ -56,14 +56,12 @@ export interface Links {
   [k: string]: unknown
 }
 
-export function isLinks(v: unknown): v is Links {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.describeFeedGenerator#links'
-  )
+export function isLinks(v: unknown): v is Links & {
+  $type: $Type<'app.bsky.feed.describeFeedGenerator', 'links'>
+} {
+  return is$typed(v, id, 'links')
 }
 
-export function validateLinks(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.describeFeedGenerator#links', v)
+export function validateLinks(v: unknown) {
+  return lexicons.validate(`${id}#links`, v) as ValidationResult<Links>
 }
diff --git a/packages/api/src/client/types/app/bsky/feed/generator.ts b/packages/api/src/client/types/app/bsky/feed/generator.ts
index b36796dd353..b92a1a44ff9 100644
--- a/packages/api/src/client/types/app/bsky/feed/generator.ts
+++ b/packages/api/src/client/types/app/bsky/feed/generator.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const id = 'app.bsky.feed.generator'
+
 export interface Record {
   did: string
   displayName: string
@@ -23,15 +25,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.generator#main' ||
-      v.$type === 'app.bsky.feed.generator')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.feed.generator', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.generator#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/api/src/client/types/app/bsky/feed/getActorFeeds.ts b/packages/api/src/client/types/app/bsky/feed/getActorFeeds.ts
index e8a0cb94bd3..98032703d46 100644
--- a/packages/api/src/client/types/app/bsky/feed/getActorFeeds.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getActorFeeds.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getActorFeeds'
+
 export interface QueryParams {
   actor: string
   limit?: number
diff --git a/packages/api/src/client/types/app/bsky/feed/getActorLikes.ts b/packages/api/src/client/types/app/bsky/feed/getActorLikes.ts
index 1da239d96f3..99545f33fe1 100644
--- a/packages/api/src/client/types/app/bsky/feed/getActorLikes.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getActorLikes.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getActorLikes'
+
 export interface QueryParams {
   actor: string
   limit?: number
diff --git a/packages/api/src/client/types/app/bsky/feed/getAuthorFeed.ts b/packages/api/src/client/types/app/bsky/feed/getAuthorFeed.ts
index 77319f28d40..25bd09b0c5a 100644
--- a/packages/api/src/client/types/app/bsky/feed/getAuthorFeed.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getAuthorFeed.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getAuthorFeed'
+
 export interface QueryParams {
   actor: string
   limit?: number
diff --git a/packages/api/src/client/types/app/bsky/feed/getFeed.ts b/packages/api/src/client/types/app/bsky/feed/getFeed.ts
index b61a1248e2a..77cf2bf2d8e 100644
--- a/packages/api/src/client/types/app/bsky/feed/getFeed.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getFeed.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getFeed'
+
 export interface QueryParams {
   feed: string
   limit?: number
diff --git a/packages/api/src/client/types/app/bsky/feed/getFeedGenerator.ts b/packages/api/src/client/types/app/bsky/feed/getFeedGenerator.ts
index 8d222f8d521..d381a0e90d2 100644
--- a/packages/api/src/client/types/app/bsky/feed/getFeedGenerator.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getFeedGenerator.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getFeedGenerator'
+
 export interface QueryParams {
   /** AT-URI of the feed generator record. */
   feed: string
diff --git a/packages/api/src/client/types/app/bsky/feed/getFeedGenerators.ts b/packages/api/src/client/types/app/bsky/feed/getFeedGenerators.ts
index 1d99fd6608c..76f852faf78 100644
--- a/packages/api/src/client/types/app/bsky/feed/getFeedGenerators.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getFeedGenerators.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getFeedGenerators'
+
 export interface QueryParams {
   feeds: string[]
 }
diff --git a/packages/api/src/client/types/app/bsky/feed/getFeedSkeleton.ts b/packages/api/src/client/types/app/bsky/feed/getFeedSkeleton.ts
index bf859cc1e87..76638027d38 100644
--- a/packages/api/src/client/types/app/bsky/feed/getFeedSkeleton.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getFeedSkeleton.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getFeedSkeleton'
+
 export interface QueryParams {
   /** Reference to feed generator record describing the specific feed being requested. */
   feed: string
diff --git a/packages/api/src/client/types/app/bsky/feed/getLikes.ts b/packages/api/src/client/types/app/bsky/feed/getLikes.ts
index 35af1b3aae5..2e3f58a2a4c 100644
--- a/packages/api/src/client/types/app/bsky/feed/getLikes.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getLikes.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.feed.getLikes'
+
 export interface QueryParams {
   /** AT-URI of the subject (eg, a post record). */
   uri: string
@@ -49,12 +51,12 @@ export interface Like {
   [k: string]: unknown
 }
 
-export function isLike(v: unknown): v is Like {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.getLikes#like'
-  )
+export function isLike(
+  v: unknown,
+): v is Like & { $type: $Type<'app.bsky.feed.getLikes', 'like'> } {
+  return is$typed(v, id, 'like')
 }
 
-export function validateLike(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.getLikes#like', v)
+export function validateLike(v: unknown) {
+  return lexicons.validate(`${id}#like`, v) as ValidationResult<Like>
 }
diff --git a/packages/api/src/client/types/app/bsky/feed/getListFeed.ts b/packages/api/src/client/types/app/bsky/feed/getListFeed.ts
index 4e47e597afd..6e6dfd6a9ff 100644
--- a/packages/api/src/client/types/app/bsky/feed/getListFeed.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getListFeed.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getListFeed'
+
 export interface QueryParams {
   /** Reference (AT-URI) to the list record. */
   list: string
diff --git a/packages/api/src/client/types/app/bsky/feed/getPostThread.ts b/packages/api/src/client/types/app/bsky/feed/getPostThread.ts
index df012607df1..53f193dd8da 100644
--- a/packages/api/src/client/types/app/bsky/feed/getPostThread.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getPostThread.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getPostThread'
+
 export interface QueryParams {
   /** Reference (AT-URI) to post record. */
   uri: string
diff --git a/packages/api/src/client/types/app/bsky/feed/getPosts.ts b/packages/api/src/client/types/app/bsky/feed/getPosts.ts
index 0ae8657de94..de9aa66b6cc 100644
--- a/packages/api/src/client/types/app/bsky/feed/getPosts.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getPosts.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getPosts'
+
 export interface QueryParams {
   /** List of post AT-URIs to return hydrated views for. */
   uris: string[]
diff --git a/packages/api/src/client/types/app/bsky/feed/getQuotes.ts b/packages/api/src/client/types/app/bsky/feed/getQuotes.ts
index aafc487cd43..f0cff90d5e1 100644
--- a/packages/api/src/client/types/app/bsky/feed/getQuotes.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getQuotes.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getQuotes'
+
 export interface QueryParams {
   /** Reference (AT-URI) of post record */
   uri: string
diff --git a/packages/api/src/client/types/app/bsky/feed/getRepostedBy.ts b/packages/api/src/client/types/app/bsky/feed/getRepostedBy.ts
index dfbac97453b..1db6626076f 100644
--- a/packages/api/src/client/types/app/bsky/feed/getRepostedBy.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getRepostedBy.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.feed.getRepostedBy'
+
 export interface QueryParams {
   /** Reference (AT-URI) of post record */
   uri: string
diff --git a/packages/api/src/client/types/app/bsky/feed/getSuggestedFeeds.ts b/packages/api/src/client/types/app/bsky/feed/getSuggestedFeeds.ts
index 2e9495d8c19..a62bed53103 100644
--- a/packages/api/src/client/types/app/bsky/feed/getSuggestedFeeds.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getSuggestedFeeds.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getSuggestedFeeds'
+
 export interface QueryParams {
   limit?: number
   cursor?: string
diff --git a/packages/api/src/client/types/app/bsky/feed/getTimeline.ts b/packages/api/src/client/types/app/bsky/feed/getTimeline.ts
index 6c5280443a9..b5a6032028c 100644
--- a/packages/api/src/client/types/app/bsky/feed/getTimeline.ts
+++ b/packages/api/src/client/types/app/bsky/feed/getTimeline.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getTimeline'
+
 export interface QueryParams {
   /** Variant 'algorithm' for timeline. Implementation-specific. NOTE: most feed flexibility has been moved to feed generator mechanism. */
   algorithm?: string
diff --git a/packages/api/src/client/types/app/bsky/feed/like.ts b/packages/api/src/client/types/app/bsky/feed/like.ts
index 10237e45f0d..1d0402a3288 100644
--- a/packages/api/src/client/types/app/bsky/feed/like.ts
+++ b/packages/api/src/client/types/app/bsky/feed/like.ts
@@ -2,25 +2,25 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const id = 'app.bsky.feed.like'
+
 export interface Record {
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.like#main' || v.$type === 'app.bsky.feed.like')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.feed.like', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.like#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/api/src/client/types/app/bsky/feed/post.ts b/packages/api/src/client/types/app/bsky/feed/post.ts
index e358409c0e0..4621ad0dc10 100644
--- a/packages/api/src/client/types/app/bsky/feed/post.ts
+++ b/packages/api/src/client/types/app/bsky/feed/post.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as AppBskyEmbedImages from '../embed/images'
 import * as AppBskyEmbedVideo from '../embed/video'
@@ -14,6 +14,8 @@ import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const id = 'app.bsky.feed.post'
+
 export interface Record {
   /** The primary post content. May be an empty string, if there are embeds. */
   text: string
@@ -41,16 +43,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.post#main' || v.$type === 'app.bsky.feed.post')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.feed.post', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 export interface ReplyRef {
@@ -59,14 +59,14 @@ export interface ReplyRef {
   [k: string]: unknown
 }
 
-export function isReplyRef(v: unknown): v is ReplyRef {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.post#replyRef'
-  )
+export function isReplyRef(
+  v: unknown,
+): v is ReplyRef & { $type: $Type<'app.bsky.feed.post', 'replyRef'> } {
+  return is$typed(v, id, 'replyRef')
 }
 
-export function validateReplyRef(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#replyRef', v)
+export function validateReplyRef(v: unknown) {
+  return lexicons.validate(`${id}#replyRef`, v) as ValidationResult<ReplyRef>
 }
 
 /** Deprecated: use facets instead. */
@@ -78,14 +78,14 @@ export interface Entity {
   [k: string]: unknown
 }
 
-export function isEntity(v: unknown): v is Entity {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.post#entity'
-  )
+export function isEntity(
+  v: unknown,
+): v is Entity & { $type: $Type<'app.bsky.feed.post', 'entity'> } {
+  return is$typed(v, id, 'entity')
 }
 
-export function validateEntity(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#entity', v)
+export function validateEntity(v: unknown) {
+  return lexicons.validate(`${id}#entity`, v) as ValidationResult<Entity>
 }
 
 /** Deprecated. Use app.bsky.richtext instead -- A text segment. Start is inclusive, end is exclusive. Indices are for utf16-encoded strings. */
@@ -95,14 +95,12 @@ export interface TextSlice {
   [k: string]: unknown
 }
 
-export function isTextSlice(v: unknown): v is TextSlice {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.post#textSlice'
-  )
+export function isTextSlice(
+  v: unknown,
+): v is TextSlice & { $type: $Type<'app.bsky.feed.post', 'textSlice'> } {
+  return is$typed(v, id, 'textSlice')
 }
 
-export function validateTextSlice(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#textSlice', v)
+export function validateTextSlice(v: unknown) {
+  return lexicons.validate(`${id}#textSlice`, v) as ValidationResult<TextSlice>
 }
diff --git a/packages/api/src/client/types/app/bsky/feed/postgate.ts b/packages/api/src/client/types/app/bsky/feed/postgate.ts
index aad8496699a..ff4de36f211 100644
--- a/packages/api/src/client/types/app/bsky/feed/postgate.ts
+++ b/packages/api/src/client/types/app/bsky/feed/postgate.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'app.bsky.feed.postgate'
 
 export interface Record {
   createdAt: string
@@ -16,17 +18,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.postgate#main' ||
-      v.$type === 'app.bsky.feed.postgate')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.feed.postgate', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.postgate#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 /** Disables embedding of this post. */
@@ -34,14 +33,15 @@ export interface DisableRule {
   [k: string]: unknown
 }
 
-export function isDisableRule(v: unknown): v is DisableRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.postgate#disableRule'
-  )
+export function isDisableRule(v: unknown): v is DisableRule & {
+  $type: $Type<'app.bsky.feed.postgate', 'disableRule'>
+} {
+  return is$typed(v, id, 'disableRule')
 }
 
-export function validateDisableRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.postgate#disableRule', v)
+export function validateDisableRule(v: unknown) {
+  return lexicons.validate(
+    `${id}#disableRule`,
+    v,
+  ) as ValidationResult<DisableRule>
 }
diff --git a/packages/api/src/client/types/app/bsky/feed/repost.ts b/packages/api/src/client/types/app/bsky/feed/repost.ts
index 2e8f6e75548..e602112d344 100644
--- a/packages/api/src/client/types/app/bsky/feed/repost.ts
+++ b/packages/api/src/client/types/app/bsky/feed/repost.ts
@@ -2,26 +2,25 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const id = 'app.bsky.feed.repost'
+
 export interface Record {
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.repost#main' ||
-      v.$type === 'app.bsky.feed.repost')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.feed.repost', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.repost#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/api/src/client/types/app/bsky/feed/searchPosts.ts b/packages/api/src/client/types/app/bsky/feed/searchPosts.ts
index 1a2ec64dcd2..d7d170af694 100644
--- a/packages/api/src/client/types/app/bsky/feed/searchPosts.ts
+++ b/packages/api/src/client/types/app/bsky/feed/searchPosts.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.searchPosts'
+
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
   q: string
diff --git a/packages/api/src/client/types/app/bsky/feed/sendInteractions.ts b/packages/api/src/client/types/app/bsky/feed/sendInteractions.ts
index 4d43e26f3dd..63701c701b4 100644
--- a/packages/api/src/client/types/app/bsky/feed/sendInteractions.ts
+++ b/packages/api/src/client/types/app/bsky/feed/sendInteractions.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.sendInteractions'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/api/src/client/types/app/bsky/feed/threadgate.ts b/packages/api/src/client/types/app/bsky/feed/threadgate.ts
index 558027fb8e9..85a1f66080d 100644
--- a/packages/api/src/client/types/app/bsky/feed/threadgate.ts
+++ b/packages/api/src/client/types/app/bsky/feed/threadgate.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'app.bsky.feed.threadgate'
 
 export interface Record {
   /** Reference (AT-URI) to the post record. */
@@ -21,17 +23,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.threadgate#main' ||
-      v.$type === 'app.bsky.feed.threadgate')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.feed.threadgate', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 /** Allow replies from actors mentioned in your post. */
@@ -39,16 +38,17 @@ export interface MentionRule {
   [k: string]: unknown
 }
 
-export function isMentionRule(v: unknown): v is MentionRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#mentionRule'
-  )
+export function isMentionRule(v: unknown): v is MentionRule & {
+  $type: $Type<'app.bsky.feed.threadgate', 'mentionRule'>
+} {
+  return is$typed(v, id, 'mentionRule')
 }
 
-export function validateMentionRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#mentionRule', v)
+export function validateMentionRule(v: unknown) {
+  return lexicons.validate(
+    `${id}#mentionRule`,
+    v,
+  ) as ValidationResult<MentionRule>
 }
 
 /** Allow replies from actors you follow. */
@@ -56,16 +56,17 @@ export interface FollowingRule {
   [k: string]: unknown
 }
 
-export function isFollowingRule(v: unknown): v is FollowingRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#followingRule'
-  )
+export function isFollowingRule(v: unknown): v is FollowingRule & {
+  $type: $Type<'app.bsky.feed.threadgate', 'followingRule'>
+} {
+  return is$typed(v, id, 'followingRule')
 }
 
-export function validateFollowingRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#followingRule', v)
+export function validateFollowingRule(v: unknown) {
+  return lexicons.validate(
+    `${id}#followingRule`,
+    v,
+  ) as ValidationResult<FollowingRule>
 }
 
 /** Allow replies from actors on a list. */
@@ -74,14 +75,12 @@ export interface ListRule {
   [k: string]: unknown
 }
 
-export function isListRule(v: unknown): v is ListRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#listRule'
-  )
+export function isListRule(
+  v: unknown,
+): v is ListRule & { $type: $Type<'app.bsky.feed.threadgate', 'listRule'> } {
+  return is$typed(v, id, 'listRule')
 }
 
-export function validateListRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#listRule', v)
+export function validateListRule(v: unknown) {
+  return lexicons.validate(`${id}#listRule`, v) as ValidationResult<ListRule>
 }
diff --git a/packages/api/src/client/types/app/bsky/graph/block.ts b/packages/api/src/client/types/app/bsky/graph/block.ts
index f2455fc08a2..4bc5a5f3038 100644
--- a/packages/api/src/client/types/app/bsky/graph/block.ts
+++ b/packages/api/src/client/types/app/bsky/graph/block.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'app.bsky.graph.block'
 
 export interface Record {
   /** DID of the account to be blocked. */
@@ -13,15 +15,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.block#main' ||
-      v.$type === 'app.bsky.graph.block')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.graph.block', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.block#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/api/src/client/types/app/bsky/graph/defs.ts b/packages/api/src/client/types/app/bsky/graph/defs.ts
index aa7e2c068b5..8edbf9e888e 100644
--- a/packages/api/src/client/types/app/bsky/graph/defs.ts
+++ b/packages/api/src/client/types/app/bsky/graph/defs.ts
@@ -2,14 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as AppBskyFeedDefs from '../feed/defs'
 
+const id = 'app.bsky.graph.defs'
+
 export interface ListViewBasic {
   uri: string
   cid: string
@@ -23,16 +25,17 @@ export interface ListViewBasic {
   [k: string]: unknown
 }
 
-export function isListViewBasic(v: unknown): v is ListViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listViewBasic'
-  )
+export function isListViewBasic(v: unknown): v is ListViewBasic & {
+  $type: $Type<'app.bsky.graph.defs', 'listViewBasic'>
+} {
+  return is$typed(v, id, 'listViewBasic')
 }
 
-export function validateListViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listViewBasic', v)
+export function validateListViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#listViewBasic`,
+    v,
+  ) as ValidationResult<ListViewBasic>
 }
 
 export interface ListView {
@@ -51,16 +54,14 @@ export interface ListView {
   [k: string]: unknown
 }
 
-export function isListView(v: unknown): v is ListView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listView'
-  )
+export function isListView(
+  v: unknown,
+): v is ListView & { $type: $Type<'app.bsky.graph.defs', 'listView'> } {
+  return is$typed(v, id, 'listView')
 }
 
-export function validateListView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listView', v)
+export function validateListView(v: unknown) {
+  return lexicons.validate(`${id}#listView`, v) as ValidationResult<ListView>
 }
 
 export interface ListItemView {
@@ -69,16 +70,17 @@ export interface ListItemView {
   [k: string]: unknown
 }
 
-export function isListItemView(v: unknown): v is ListItemView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listItemView'
-  )
+export function isListItemView(
+  v: unknown,
+): v is ListItemView & { $type: $Type<'app.bsky.graph.defs', 'listItemView'> } {
+  return is$typed(v, id, 'listItemView')
 }
 
-export function validateListItemView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listItemView', v)
+export function validateListItemView(v: unknown) {
+  return lexicons.validate(
+    `${id}#listItemView`,
+    v,
+  ) as ValidationResult<ListItemView>
 }
 
 export interface StarterPackView {
@@ -96,16 +98,17 @@ export interface StarterPackView {
   [k: string]: unknown
 }
 
-export function isStarterPackView(v: unknown): v is StarterPackView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#starterPackView'
-  )
+export function isStarterPackView(v: unknown): v is StarterPackView & {
+  $type: $Type<'app.bsky.graph.defs', 'starterPackView'>
+} {
+  return is$typed(v, id, 'starterPackView')
 }
 
-export function validateStarterPackView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#starterPackView', v)
+export function validateStarterPackView(v: unknown) {
+  return lexicons.validate(
+    `${id}#starterPackView`,
+    v,
+  ) as ValidationResult<StarterPackView>
 }
 
 export interface StarterPackViewBasic {
@@ -121,16 +124,19 @@ export interface StarterPackViewBasic {
   [k: string]: unknown
 }
 
-export function isStarterPackViewBasic(v: unknown): v is StarterPackViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#starterPackViewBasic'
-  )
+export function isStarterPackViewBasic(
+  v: unknown,
+): v is StarterPackViewBasic & {
+  $type: $Type<'app.bsky.graph.defs', 'starterPackViewBasic'>
+} {
+  return is$typed(v, id, 'starterPackViewBasic')
 }
 
-export function validateStarterPackViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#starterPackViewBasic', v)
+export function validateStarterPackViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#starterPackViewBasic`,
+    v,
+  ) as ValidationResult<StarterPackViewBasic>
 }
 
 export type ListPurpose =
@@ -140,11 +146,11 @@ export type ListPurpose =
   | (string & {})
 
 /** A list of actors to apply an aggregate moderation action (mute/block) on. */
-export const MODLIST = 'app.bsky.graph.defs#modlist'
+export const MODLIST = `${id}#modlist`
 /** A list of actors used for curation purposes such as list feeds or interaction gating. */
-export const CURATELIST = 'app.bsky.graph.defs#curatelist'
+export const CURATELIST = `${id}#curatelist`
 /** A list of actors used for only for reference purposes such as within a starter pack. */
-export const REFERENCELIST = 'app.bsky.graph.defs#referencelist'
+export const REFERENCELIST = `${id}#referencelist`
 
 export interface ListViewerState {
   muted?: boolean
@@ -152,16 +158,17 @@ export interface ListViewerState {
   [k: string]: unknown
 }
 
-export function isListViewerState(v: unknown): v is ListViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listViewerState'
-  )
+export function isListViewerState(v: unknown): v is ListViewerState & {
+  $type: $Type<'app.bsky.graph.defs', 'listViewerState'>
+} {
+  return is$typed(v, id, 'listViewerState')
 }
 
-export function validateListViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listViewerState', v)
+export function validateListViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#listViewerState`,
+    v,
+  ) as ValidationResult<ListViewerState>
 }
 
 /** indicates that a handle or DID could not be resolved */
@@ -171,16 +178,17 @@ export interface NotFoundActor {
   [k: string]: unknown
 }
 
-export function isNotFoundActor(v: unknown): v is NotFoundActor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#notFoundActor'
-  )
+export function isNotFoundActor(v: unknown): v is NotFoundActor & {
+  $type: $Type<'app.bsky.graph.defs', 'notFoundActor'>
+} {
+  return is$typed(v, id, 'notFoundActor')
 }
 
-export function validateNotFoundActor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#notFoundActor', v)
+export function validateNotFoundActor(v: unknown) {
+  return lexicons.validate(
+    `${id}#notFoundActor`,
+    v,
+  ) as ValidationResult<NotFoundActor>
 }
 
 /** lists the bi-directional graph relationships between one actor (not indicated in the object), and the target actors (the DID included in the object) */
@@ -193,14 +201,15 @@ export interface Relationship {
   [k: string]: unknown
 }
 
-export function isRelationship(v: unknown): v is Relationship {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#relationship'
-  )
+export function isRelationship(
+  v: unknown,
+): v is Relationship & { $type: $Type<'app.bsky.graph.defs', 'relationship'> } {
+  return is$typed(v, id, 'relationship')
 }
 
-export function validateRelationship(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#relationship', v)
+export function validateRelationship(v: unknown) {
+  return lexicons.validate(
+    `${id}#relationship`,
+    v,
+  ) as ValidationResult<Relationship>
 }
diff --git a/packages/api/src/client/types/app/bsky/graph/follow.ts b/packages/api/src/client/types/app/bsky/graph/follow.ts
index a68f434f3c8..cd7728fdd18 100644
--- a/packages/api/src/client/types/app/bsky/graph/follow.ts
+++ b/packages/api/src/client/types/app/bsky/graph/follow.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'app.bsky.graph.follow'
 
 export interface Record {
   subject: string
@@ -12,15 +14,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.follow#main' ||
-      v.$type === 'app.bsky.graph.follow')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.graph.follow', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.follow#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/api/src/client/types/app/bsky/graph/getActorStarterPacks.ts b/packages/api/src/client/types/app/bsky/graph/getActorStarterPacks.ts
index bb374e2318d..0d56a3536d0 100644
--- a/packages/api/src/client/types/app/bsky/graph/getActorStarterPacks.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getActorStarterPacks.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getActorStarterPacks'
+
 export interface QueryParams {
   actor: string
   limit?: number
diff --git a/packages/api/src/client/types/app/bsky/graph/getBlocks.ts b/packages/api/src/client/types/app/bsky/graph/getBlocks.ts
index f0e4bd96bc8..7858841eb61 100644
--- a/packages/api/src/client/types/app/bsky/graph/getBlocks.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getBlocks.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.graph.getBlocks'
+
 export interface QueryParams {
   limit?: number
   cursor?: string
diff --git a/packages/api/src/client/types/app/bsky/graph/getFollowers.ts b/packages/api/src/client/types/app/bsky/graph/getFollowers.ts
index f55649dc769..3d4121bc0a7 100644
--- a/packages/api/src/client/types/app/bsky/graph/getFollowers.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getFollowers.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.graph.getFollowers'
+
 export interface QueryParams {
   actor: string
   limit?: number
diff --git a/packages/api/src/client/types/app/bsky/graph/getFollows.ts b/packages/api/src/client/types/app/bsky/graph/getFollows.ts
index 8570c4a14c0..75b05d1c513 100644
--- a/packages/api/src/client/types/app/bsky/graph/getFollows.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getFollows.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.graph.getFollows'
+
 export interface QueryParams {
   actor: string
   limit?: number
diff --git a/packages/api/src/client/types/app/bsky/graph/getKnownFollowers.ts b/packages/api/src/client/types/app/bsky/graph/getKnownFollowers.ts
index f55649dc769..24dfd79f3ab 100644
--- a/packages/api/src/client/types/app/bsky/graph/getKnownFollowers.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getKnownFollowers.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.graph.getKnownFollowers'
+
 export interface QueryParams {
   actor: string
   limit?: number
diff --git a/packages/api/src/client/types/app/bsky/graph/getList.ts b/packages/api/src/client/types/app/bsky/graph/getList.ts
index bebde2b49c3..89bc0eeacb9 100644
--- a/packages/api/src/client/types/app/bsky/graph/getList.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getList.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getList'
+
 export interface QueryParams {
   /** Reference (AT-URI) of the list record to hydrate. */
   list: string
diff --git a/packages/api/src/client/types/app/bsky/graph/getListBlocks.ts b/packages/api/src/client/types/app/bsky/graph/getListBlocks.ts
index d3c7ad5ed7b..0be93d089f6 100644
--- a/packages/api/src/client/types/app/bsky/graph/getListBlocks.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getListBlocks.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getListBlocks'
+
 export interface QueryParams {
   limit?: number
   cursor?: string
diff --git a/packages/api/src/client/types/app/bsky/graph/getListMutes.ts b/packages/api/src/client/types/app/bsky/graph/getListMutes.ts
index d3c7ad5ed7b..e377ac14d7a 100644
--- a/packages/api/src/client/types/app/bsky/graph/getListMutes.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getListMutes.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getListMutes'
+
 export interface QueryParams {
   limit?: number
   cursor?: string
diff --git a/packages/api/src/client/types/app/bsky/graph/getLists.ts b/packages/api/src/client/types/app/bsky/graph/getLists.ts
index 89a4bfd58df..6cae28caa98 100644
--- a/packages/api/src/client/types/app/bsky/graph/getLists.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getLists.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getLists'
+
 export interface QueryParams {
   /** The account (actor) to enumerate lists from. */
   actor: string
diff --git a/packages/api/src/client/types/app/bsky/graph/getMutes.ts b/packages/api/src/client/types/app/bsky/graph/getMutes.ts
index 0ee441cf9eb..a3708bdc5e9 100644
--- a/packages/api/src/client/types/app/bsky/graph/getMutes.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getMutes.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.graph.getMutes'
+
 export interface QueryParams {
   limit?: number
   cursor?: string
diff --git a/packages/api/src/client/types/app/bsky/graph/getRelationships.ts b/packages/api/src/client/types/app/bsky/graph/getRelationships.ts
index 20194662b71..fba7825bdfb 100644
--- a/packages/api/src/client/types/app/bsky/graph/getRelationships.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getRelationships.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getRelationships'
+
 export interface QueryParams {
   /** Primary account requesting relationships for. */
   actor: string
diff --git a/packages/api/src/client/types/app/bsky/graph/getStarterPack.ts b/packages/api/src/client/types/app/bsky/graph/getStarterPack.ts
index 7eafb2d228d..c29073c7e8a 100644
--- a/packages/api/src/client/types/app/bsky/graph/getStarterPack.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getStarterPack.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getStarterPack'
+
 export interface QueryParams {
   /** Reference (AT-URI) of the starter pack record. */
   starterPack: string
diff --git a/packages/api/src/client/types/app/bsky/graph/getStarterPacks.ts b/packages/api/src/client/types/app/bsky/graph/getStarterPacks.ts
index 50dbfdbaeda..d1c2df237b4 100644
--- a/packages/api/src/client/types/app/bsky/graph/getStarterPacks.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getStarterPacks.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getStarterPacks'
+
 export interface QueryParams {
   uris: string[]
 }
diff --git a/packages/api/src/client/types/app/bsky/graph/getSuggestedFollowsByActor.ts b/packages/api/src/client/types/app/bsky/graph/getSuggestedFollowsByActor.ts
index 4747afb19fc..b3df5a5e9c8 100644
--- a/packages/api/src/client/types/app/bsky/graph/getSuggestedFollowsByActor.ts
+++ b/packages/api/src/client/types/app/bsky/graph/getSuggestedFollowsByActor.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.graph.getSuggestedFollowsByActor'
+
 export interface QueryParams {
   actor: string
 }
diff --git a/packages/api/src/client/types/app/bsky/graph/list.ts b/packages/api/src/client/types/app/bsky/graph/list.ts
index fec652ccb12..f1e242d1661 100644
--- a/packages/api/src/client/types/app/bsky/graph/list.ts
+++ b/packages/api/src/client/types/app/bsky/graph/list.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyGraphDefs from './defs'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const id = 'app.bsky.graph.list'
+
 export interface Record {
   purpose: AppBskyGraphDefs.ListPurpose
   /** Display name for list; can not be empty. */
@@ -23,15 +25,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.list#main' ||
-      v.$type === 'app.bsky.graph.list')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.graph.list', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.list#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/api/src/client/types/app/bsky/graph/listblock.ts b/packages/api/src/client/types/app/bsky/graph/listblock.ts
index e0f02be268f..ede600c112c 100644
--- a/packages/api/src/client/types/app/bsky/graph/listblock.ts
+++ b/packages/api/src/client/types/app/bsky/graph/listblock.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'app.bsky.graph.listblock'
 
 export interface Record {
   /** Reference (AT-URI) to the mod list record. */
@@ -13,15 +15,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.listblock#main' ||
-      v.$type === 'app.bsky.graph.listblock')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.graph.listblock', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.listblock#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/api/src/client/types/app/bsky/graph/listitem.ts b/packages/api/src/client/types/app/bsky/graph/listitem.ts
index d4fb5631e84..0a1a4590db6 100644
--- a/packages/api/src/client/types/app/bsky/graph/listitem.ts
+++ b/packages/api/src/client/types/app/bsky/graph/listitem.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'app.bsky.graph.listitem'
 
 export interface Record {
   /** The account which is included on the list. */
@@ -15,15 +17,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.listitem#main' ||
-      v.$type === 'app.bsky.graph.listitem')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.graph.listitem', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.listitem#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/api/src/client/types/app/bsky/graph/muteActor.ts b/packages/api/src/client/types/app/bsky/graph/muteActor.ts
index c21c00b2069..18fbd027e53 100644
--- a/packages/api/src/client/types/app/bsky/graph/muteActor.ts
+++ b/packages/api/src/client/types/app/bsky/graph/muteActor.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'app.bsky.graph.muteActor'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/app/bsky/graph/muteActorList.ts b/packages/api/src/client/types/app/bsky/graph/muteActorList.ts
index 8a0e8586deb..6da99862d1c 100644
--- a/packages/api/src/client/types/app/bsky/graph/muteActorList.ts
+++ b/packages/api/src/client/types/app/bsky/graph/muteActorList.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'app.bsky.graph.muteActorList'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/app/bsky/graph/muteThread.ts b/packages/api/src/client/types/app/bsky/graph/muteThread.ts
index 275ba7a0f22..1dde979bbbc 100644
--- a/packages/api/src/client/types/app/bsky/graph/muteThread.ts
+++ b/packages/api/src/client/types/app/bsky/graph/muteThread.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'app.bsky.graph.muteThread'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/app/bsky/graph/searchStarterPacks.ts b/packages/api/src/client/types/app/bsky/graph/searchStarterPacks.ts
index 8291b219a62..10c89a85b0b 100644
--- a/packages/api/src/client/types/app/bsky/graph/searchStarterPacks.ts
+++ b/packages/api/src/client/types/app/bsky/graph/searchStarterPacks.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.searchStarterPacks'
+
 export interface QueryParams {
   /** Search query string. Syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
   q: string
diff --git a/packages/api/src/client/types/app/bsky/graph/starterpack.ts b/packages/api/src/client/types/app/bsky/graph/starterpack.ts
index 7cb0aa26c3f..7466af55782 100644
--- a/packages/api/src/client/types/app/bsky/graph/starterpack.ts
+++ b/packages/api/src/client/types/app/bsky/graph/starterpack.ts
@@ -2,11 +2,13 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 
+const id = 'app.bsky.graph.starterpack'
+
 export interface Record {
   /** Display name for starter pack; can not be empty. */
   name: string
@@ -19,17 +21,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.starterpack#main' ||
-      v.$type === 'app.bsky.graph.starterpack')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.graph.starterpack', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.starterpack#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 export interface FeedItem {
@@ -37,14 +36,12 @@ export interface FeedItem {
   [k: string]: unknown
 }
 
-export function isFeedItem(v: unknown): v is FeedItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.starterpack#feedItem'
-  )
+export function isFeedItem(
+  v: unknown,
+): v is FeedItem & { $type: $Type<'app.bsky.graph.starterpack', 'feedItem'> } {
+  return is$typed(v, id, 'feedItem')
 }
 
-export function validateFeedItem(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.starterpack#feedItem', v)
+export function validateFeedItem(v: unknown) {
+  return lexicons.validate(`${id}#feedItem`, v) as ValidationResult<FeedItem>
 }
diff --git a/packages/api/src/client/types/app/bsky/graph/unmuteActor.ts b/packages/api/src/client/types/app/bsky/graph/unmuteActor.ts
index c21c00b2069..0cb4970f37d 100644
--- a/packages/api/src/client/types/app/bsky/graph/unmuteActor.ts
+++ b/packages/api/src/client/types/app/bsky/graph/unmuteActor.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'app.bsky.graph.unmuteActor'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/app/bsky/graph/unmuteActorList.ts b/packages/api/src/client/types/app/bsky/graph/unmuteActorList.ts
index 8a0e8586deb..f866d0d6cdd 100644
--- a/packages/api/src/client/types/app/bsky/graph/unmuteActorList.ts
+++ b/packages/api/src/client/types/app/bsky/graph/unmuteActorList.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'app.bsky.graph.unmuteActorList'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/app/bsky/graph/unmuteThread.ts b/packages/api/src/client/types/app/bsky/graph/unmuteThread.ts
index 275ba7a0f22..25b03006f27 100644
--- a/packages/api/src/client/types/app/bsky/graph/unmuteThread.ts
+++ b/packages/api/src/client/types/app/bsky/graph/unmuteThread.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'app.bsky.graph.unmuteThread'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/app/bsky/labeler/defs.ts b/packages/api/src/client/types/app/bsky/labeler/defs.ts
index 3d9b1d77f8a..fefa71f91a5 100644
--- a/packages/api/src/client/types/app/bsky/labeler/defs.ts
+++ b/packages/api/src/client/types/app/bsky/labeler/defs.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const id = 'app.bsky.labeler.defs'
+
 export interface LabelerView {
   uri: string
   cid: string
@@ -19,16 +21,17 @@ export interface LabelerView {
   [k: string]: unknown
 }
 
-export function isLabelerView(v: unknown): v is LabelerView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerView'
-  )
+export function isLabelerView(
+  v: unknown,
+): v is LabelerView & { $type: $Type<'app.bsky.labeler.defs', 'labelerView'> } {
+  return is$typed(v, id, 'labelerView')
 }
 
-export function validateLabelerView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerView', v)
+export function validateLabelerView(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerView`,
+    v,
+  ) as ValidationResult<LabelerView>
 }
 
 export interface LabelerViewDetailed {
@@ -43,16 +46,17 @@ export interface LabelerViewDetailed {
   [k: string]: unknown
 }
 
-export function isLabelerViewDetailed(v: unknown): v is LabelerViewDetailed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerViewDetailed'
-  )
+export function isLabelerViewDetailed(v: unknown): v is LabelerViewDetailed & {
+  $type: $Type<'app.bsky.labeler.defs', 'labelerViewDetailed'>
+} {
+  return is$typed(v, id, 'labelerViewDetailed')
 }
 
-export function validateLabelerViewDetailed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerViewDetailed', v)
+export function validateLabelerViewDetailed(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerViewDetailed`,
+    v,
+  ) as ValidationResult<LabelerViewDetailed>
 }
 
 export interface LabelerViewerState {
@@ -60,16 +64,17 @@ export interface LabelerViewerState {
   [k: string]: unknown
 }
 
-export function isLabelerViewerState(v: unknown): v is LabelerViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerViewerState'
-  )
+export function isLabelerViewerState(v: unknown): v is LabelerViewerState & {
+  $type: $Type<'app.bsky.labeler.defs', 'labelerViewerState'>
+} {
+  return is$typed(v, id, 'labelerViewerState')
 }
 
-export function validateLabelerViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerViewerState', v)
+export function validateLabelerViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerViewerState`,
+    v,
+  ) as ValidationResult<LabelerViewerState>
 }
 
 export interface LabelerPolicies {
@@ -80,14 +85,15 @@ export interface LabelerPolicies {
   [k: string]: unknown
 }
 
-export function isLabelerPolicies(v: unknown): v is LabelerPolicies {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerPolicies'
-  )
+export function isLabelerPolicies(v: unknown): v is LabelerPolicies & {
+  $type: $Type<'app.bsky.labeler.defs', 'labelerPolicies'>
+} {
+  return is$typed(v, id, 'labelerPolicies')
 }
 
-export function validateLabelerPolicies(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerPolicies', v)
+export function validateLabelerPolicies(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerPolicies`,
+    v,
+  ) as ValidationResult<LabelerPolicies>
 }
diff --git a/packages/api/src/client/types/app/bsky/labeler/getServices.ts b/packages/api/src/client/types/app/bsky/labeler/getServices.ts
index 688f847d508..418dd8e906e 100644
--- a/packages/api/src/client/types/app/bsky/labeler/getServices.ts
+++ b/packages/api/src/client/types/app/bsky/labeler/getServices.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyLabelerDefs from './defs'
 
+const id = 'app.bsky.labeler.getServices'
+
 export interface QueryParams {
   dids: string[]
   detailed?: boolean
diff --git a/packages/api/src/client/types/app/bsky/labeler/service.ts b/packages/api/src/client/types/app/bsky/labeler/service.ts
index 818249468ec..347645730d0 100644
--- a/packages/api/src/client/types/app/bsky/labeler/service.ts
+++ b/packages/api/src/client/types/app/bsky/labeler/service.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyLabelerDefs from './defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const id = 'app.bsky.labeler.service'
+
 export interface Record {
   policies: AppBskyLabelerDefs.LabelerPolicies
   labels?:
@@ -17,15 +19,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.labeler.service#main' ||
-      v.$type === 'app.bsky.labeler.service')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.labeler.service', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.service#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/api/src/client/types/app/bsky/notification/getUnreadCount.ts b/packages/api/src/client/types/app/bsky/notification/getUnreadCount.ts
index 00600ea54e7..b39aec7880a 100644
--- a/packages/api/src/client/types/app/bsky/notification/getUnreadCount.ts
+++ b/packages/api/src/client/types/app/bsky/notification/getUnreadCount.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'app.bsky.notification.getUnreadCount'
 
 export interface QueryParams {
   priority?: boolean
diff --git a/packages/api/src/client/types/app/bsky/notification/listNotifications.ts b/packages/api/src/client/types/app/bsky/notification/listNotifications.ts
index 92b3a27fece..8b81dc38ff3 100644
--- a/packages/api/src/client/types/app/bsky/notification/listNotifications.ts
+++ b/packages/api/src/client/types/app/bsky/notification/listNotifications.ts
@@ -3,12 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const id = 'app.bsky.notification.listNotifications'
+
 export interface QueryParams {
   /** Notification reasons to include in response. */
   reasons?: string[]
@@ -65,17 +67,15 @@ export interface Notification {
   [k: string]: unknown
 }
 
-export function isNotification(v: unknown): v is Notification {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.notification.listNotifications#notification'
-  )
+export function isNotification(v: unknown): v is Notification & {
+  $type: $Type<'app.bsky.notification.listNotifications', 'notification'>
+} {
+  return is$typed(v, id, 'notification')
 }
 
-export function validateNotification(v: unknown): ValidationResult {
+export function validateNotification(v: unknown) {
   return lexicons.validate(
-    'app.bsky.notification.listNotifications#notification',
+    `${id}#notification`,
     v,
-  )
+  ) as ValidationResult<Notification>
 }
diff --git a/packages/api/src/client/types/app/bsky/notification/putPreferences.ts b/packages/api/src/client/types/app/bsky/notification/putPreferences.ts
index bc79909f459..507528b2e05 100644
--- a/packages/api/src/client/types/app/bsky/notification/putPreferences.ts
+++ b/packages/api/src/client/types/app/bsky/notification/putPreferences.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'app.bsky.notification.putPreferences'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/app/bsky/notification/registerPush.ts b/packages/api/src/client/types/app/bsky/notification/registerPush.ts
index ddc9d438537..65f40b64633 100644
--- a/packages/api/src/client/types/app/bsky/notification/registerPush.ts
+++ b/packages/api/src/client/types/app/bsky/notification/registerPush.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'app.bsky.notification.registerPush'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/app/bsky/notification/updateSeen.ts b/packages/api/src/client/types/app/bsky/notification/updateSeen.ts
index 7151e9b0cd4..eaa486ee2f4 100644
--- a/packages/api/src/client/types/app/bsky/notification/updateSeen.ts
+++ b/packages/api/src/client/types/app/bsky/notification/updateSeen.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'app.bsky.notification.updateSeen'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/app/bsky/richtext/facet.ts b/packages/api/src/client/types/app/bsky/richtext/facet.ts
index 836136b7dac..56d2aebb4cd 100644
--- a/packages/api/src/client/types/app/bsky/richtext/facet.ts
+++ b/packages/api/src/client/types/app/bsky/richtext/facet.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'app.bsky.richtext.facet'
 
 /** Annotation of a sub-string within rich text. */
 export interface Main {
@@ -13,17 +15,14 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.richtext.facet#main' ||
-      v.$type === 'app.bsky.richtext.facet')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: $Type<'app.bsky.richtext.facet', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 /** Facet feature for mention of another account. The text is usually a handle, including a '@' prefix, but the facet reference is a DID. */
@@ -32,16 +31,14 @@ export interface Mention {
   [k: string]: unknown
 }
 
-export function isMention(v: unknown): v is Mention {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#mention'
-  )
+export function isMention(
+  v: unknown,
+): v is Mention & { $type: $Type<'app.bsky.richtext.facet', 'mention'> } {
+  return is$typed(v, id, 'mention')
 }
 
-export function validateMention(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#mention', v)
+export function validateMention(v: unknown) {
+  return lexicons.validate(`${id}#mention`, v) as ValidationResult<Mention>
 }
 
 /** Facet feature for a URL. The text URL may have been simplified or truncated, but the facet reference should be a complete URL. */
@@ -50,16 +47,14 @@ export interface Link {
   [k: string]: unknown
 }
 
-export function isLink(v: unknown): v is Link {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#link'
-  )
+export function isLink(
+  v: unknown,
+): v is Link & { $type: $Type<'app.bsky.richtext.facet', 'link'> } {
+  return is$typed(v, id, 'link')
 }
 
-export function validateLink(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#link', v)
+export function validateLink(v: unknown) {
+  return lexicons.validate(`${id}#link`, v) as ValidationResult<Link>
 }
 
 /** Facet feature for a hashtag. The text usually includes a '#' prefix, but the facet reference should not (except in the case of 'double hash tags'). */
@@ -68,14 +63,14 @@ export interface Tag {
   [k: string]: unknown
 }
 
-export function isTag(v: unknown): v is Tag {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.richtext.facet#tag'
-  )
+export function isTag(
+  v: unknown,
+): v is Tag & { $type: $Type<'app.bsky.richtext.facet', 'tag'> } {
+  return is$typed(v, id, 'tag')
 }
 
-export function validateTag(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#tag', v)
+export function validateTag(v: unknown) {
+  return lexicons.validate(`${id}#tag`, v) as ValidationResult<Tag>
 }
 
 /** Specifies the sub-string range a facet feature applies to. Start index is inclusive, end index is exclusive. Indices are zero-indexed, counting bytes of the UTF-8 encoded text. NOTE: some languages, like Javascript, use UTF-16 or Unicode codepoints for string slice indexing; in these languages, convert to byte arrays before working with facets. */
@@ -85,14 +80,12 @@ export interface ByteSlice {
   [k: string]: unknown
 }
 
-export function isByteSlice(v: unknown): v is ByteSlice {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#byteSlice'
-  )
+export function isByteSlice(
+  v: unknown,
+): v is ByteSlice & { $type: $Type<'app.bsky.richtext.facet', 'byteSlice'> } {
+  return is$typed(v, id, 'byteSlice')
 }
 
-export function validateByteSlice(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#byteSlice', v)
+export function validateByteSlice(v: unknown) {
+  return lexicons.validate(`${id}#byteSlice`, v) as ValidationResult<ByteSlice>
 }
diff --git a/packages/api/src/client/types/app/bsky/unspecced/defs.ts b/packages/api/src/client/types/app/bsky/unspecced/defs.ts
index 81f821ecf73..7e5d8b5bb14 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/defs.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/defs.ts
@@ -2,25 +2,28 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'app.bsky.unspecced.defs'
 
 export interface SkeletonSearchPost {
   uri: string
   [k: string]: unknown
 }
 
-export function isSkeletonSearchPost(v: unknown): v is SkeletonSearchPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchPost'
-  )
+export function isSkeletonSearchPost(v: unknown): v is SkeletonSearchPost & {
+  $type: $Type<'app.bsky.unspecced.defs', 'skeletonSearchPost'>
+} {
+  return is$typed(v, id, 'skeletonSearchPost')
 }
 
-export function validateSkeletonSearchPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#skeletonSearchPost', v)
+export function validateSkeletonSearchPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonSearchPost`,
+    v,
+  ) as ValidationResult<SkeletonSearchPost>
 }
 
 export interface SkeletonSearchActor {
@@ -28,16 +31,17 @@ export interface SkeletonSearchActor {
   [k: string]: unknown
 }
 
-export function isSkeletonSearchActor(v: unknown): v is SkeletonSearchActor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchActor'
-  )
+export function isSkeletonSearchActor(v: unknown): v is SkeletonSearchActor & {
+  $type: $Type<'app.bsky.unspecced.defs', 'skeletonSearchActor'>
+} {
+  return is$typed(v, id, 'skeletonSearchActor')
 }
 
-export function validateSkeletonSearchActor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#skeletonSearchActor', v)
+export function validateSkeletonSearchActor(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonSearchActor`,
+    v,
+  ) as ValidationResult<SkeletonSearchActor>
 }
 
 export interface SkeletonSearchStarterPack {
@@ -47,21 +51,17 @@ export interface SkeletonSearchStarterPack {
 
 export function isSkeletonSearchStarterPack(
   v: unknown,
-): v is SkeletonSearchStarterPack {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchStarterPack'
-  )
+): v is SkeletonSearchStarterPack & {
+  $type: $Type<'app.bsky.unspecced.defs', 'skeletonSearchStarterPack'>
+} {
+  return is$typed(v, id, 'skeletonSearchStarterPack')
 }
 
-export function validateSkeletonSearchStarterPack(
-  v: unknown,
-): ValidationResult {
+export function validateSkeletonSearchStarterPack(v: unknown) {
   return lexicons.validate(
-    'app.bsky.unspecced.defs#skeletonSearchStarterPack',
+    `${id}#skeletonSearchStarterPack`,
     v,
-  )
+  ) as ValidationResult<SkeletonSearchStarterPack>
 }
 
 export interface TrendingTopic {
@@ -72,14 +72,15 @@ export interface TrendingTopic {
   [k: string]: unknown
 }
 
-export function isTrendingTopic(v: unknown): v is TrendingTopic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#trendingTopic'
-  )
+export function isTrendingTopic(v: unknown): v is TrendingTopic & {
+  $type: $Type<'app.bsky.unspecced.defs', 'trendingTopic'>
+} {
+  return is$typed(v, id, 'trendingTopic')
 }
 
-export function validateTrendingTopic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#trendingTopic', v)
+export function validateTrendingTopic(v: unknown) {
+  return lexicons.validate(
+    `${id}#trendingTopic`,
+    v,
+  ) as ValidationResult<TrendingTopic>
 }
diff --git a/packages/api/src/client/types/app/bsky/unspecced/getConfig.ts b/packages/api/src/client/types/app/bsky/unspecced/getConfig.ts
index d1ee6f7957d..0f349472146 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/getConfig.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/getConfig.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'app.bsky.unspecced.getConfig'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/app/bsky/unspecced/getPopularFeedGenerators.ts b/packages/api/src/client/types/app/bsky/unspecced/getPopularFeedGenerators.ts
index 780b4b6641c..0192a32c8f7 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/getPopularFeedGenerators.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/getPopularFeedGenerators.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyFeedDefs from '../feed/defs'
 
+const id = 'app.bsky.unspecced.getPopularFeedGenerators'
+
 export interface QueryParams {
   limit?: number
   cursor?: string
diff --git a/packages/api/src/client/types/app/bsky/unspecced/getSuggestionsSkeleton.ts b/packages/api/src/client/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
index 6ed519ef212..9df9298b22f 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyUnspeccedDefs from './defs'
 
+const id = 'app.bsky.unspecced.getSuggestionsSkeleton'
+
 export interface QueryParams {
   /** DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking. */
   viewer?: string
diff --git a/packages/api/src/client/types/app/bsky/unspecced/getTaggedSuggestions.ts b/packages/api/src/client/types/app/bsky/unspecced/getTaggedSuggestions.ts
index 0ee04b8e85d..54d1158c093 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/getTaggedSuggestions.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/getTaggedSuggestions.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'app.bsky.unspecced.getTaggedSuggestions'
 
 export interface QueryParams {}
 
@@ -38,17 +40,15 @@ export interface Suggestion {
   [k: string]: unknown
 }
 
-export function isSuggestion(v: unknown): v is Suggestion {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.getTaggedSuggestions#suggestion'
-  )
+export function isSuggestion(v: unknown): v is Suggestion & {
+  $type: $Type<'app.bsky.unspecced.getTaggedSuggestions', 'suggestion'>
+} {
+  return is$typed(v, id, 'suggestion')
 }
 
-export function validateSuggestion(v: unknown): ValidationResult {
+export function validateSuggestion(v: unknown) {
   return lexicons.validate(
-    'app.bsky.unspecced.getTaggedSuggestions#suggestion',
+    `${id}#suggestion`,
     v,
-  )
+  ) as ValidationResult<Suggestion>
 }
diff --git a/packages/api/src/client/types/app/bsky/unspecced/getTrendingTopics.ts b/packages/api/src/client/types/app/bsky/unspecced/getTrendingTopics.ts
index 70e790e14ba..6839bddeafe 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/getTrendingTopics.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/getTrendingTopics.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyUnspeccedDefs from './defs'
 
+const id = 'app.bsky.unspecced.getTrendingTopics'
+
 export interface QueryParams {
   /** DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking. */
   viewer?: string
diff --git a/packages/api/src/client/types/app/bsky/unspecced/searchActorsSkeleton.ts b/packages/api/src/client/types/app/bsky/unspecced/searchActorsSkeleton.ts
index d9fe6737d37..7799158a8ec 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/searchActorsSkeleton.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/searchActorsSkeleton.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyUnspeccedDefs from './defs'
 
+const id = 'app.bsky.unspecced.searchActorsSkeleton'
+
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. For typeahead search, only simple term match is supported, not full syntax. */
   q: string
diff --git a/packages/api/src/client/types/app/bsky/unspecced/searchPostsSkeleton.ts b/packages/api/src/client/types/app/bsky/unspecced/searchPostsSkeleton.ts
index ea0135dde83..00e032f2be9 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/searchPostsSkeleton.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/searchPostsSkeleton.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyUnspeccedDefs from './defs'
 
+const id = 'app.bsky.unspecced.searchPostsSkeleton'
+
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
   q: string
diff --git a/packages/api/src/client/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts b/packages/api/src/client/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
index c331b86d3e1..51cb7b9e78a 100644
--- a/packages/api/src/client/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
+++ b/packages/api/src/client/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyUnspeccedDefs from './defs'
 
+const id = 'app.bsky.unspecced.searchStarterPacksSkeleton'
+
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
   q: string
diff --git a/packages/api/src/client/types/app/bsky/video/defs.ts b/packages/api/src/client/types/app/bsky/video/defs.ts
index a7ec84316b6..3cf6cae3436 100644
--- a/packages/api/src/client/types/app/bsky/video/defs.ts
+++ b/packages/api/src/client/types/app/bsky/video/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'app.bsky.video.defs'
 
 export interface JobStatus {
   jobId: string
@@ -19,14 +21,12 @@ export interface JobStatus {
   [k: string]: unknown
 }
 
-export function isJobStatus(v: unknown): v is JobStatus {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.video.defs#jobStatus'
-  )
+export function isJobStatus(
+  v: unknown,
+): v is JobStatus & { $type: $Type<'app.bsky.video.defs', 'jobStatus'> } {
+  return is$typed(v, id, 'jobStatus')
 }
 
-export function validateJobStatus(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.video.defs#jobStatus', v)
+export function validateJobStatus(v: unknown) {
+  return lexicons.validate(`${id}#jobStatus`, v) as ValidationResult<JobStatus>
 }
diff --git a/packages/api/src/client/types/app/bsky/video/getJobStatus.ts b/packages/api/src/client/types/app/bsky/video/getJobStatus.ts
index 0e9638311c0..a303f44ed52 100644
--- a/packages/api/src/client/types/app/bsky/video/getJobStatus.ts
+++ b/packages/api/src/client/types/app/bsky/video/getJobStatus.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyVideoDefs from './defs'
 
+const id = 'app.bsky.video.getJobStatus'
+
 export interface QueryParams {
   jobId: string
 }
diff --git a/packages/api/src/client/types/app/bsky/video/getUploadLimits.ts b/packages/api/src/client/types/app/bsky/video/getUploadLimits.ts
index 4a2f13617b3..dc653bc87f9 100644
--- a/packages/api/src/client/types/app/bsky/video/getUploadLimits.ts
+++ b/packages/api/src/client/types/app/bsky/video/getUploadLimits.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'app.bsky.video.getUploadLimits'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/app/bsky/video/uploadVideo.ts b/packages/api/src/client/types/app/bsky/video/uploadVideo.ts
index f51ba897bbe..f56dd13cec2 100644
--- a/packages/api/src/client/types/app/bsky/video/uploadVideo.ts
+++ b/packages/api/src/client/types/app/bsky/video/uploadVideo.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyVideoDefs from './defs'
 
+const id = 'app.bsky.video.uploadVideo'
+
 export interface QueryParams {}
 
 export type InputSchema = string | Uint8Array | Blob
diff --git a/packages/api/src/client/types/chat/bsky/actor/declaration.ts b/packages/api/src/client/types/chat/bsky/actor/declaration.ts
index 99b14f45608..a17b0b24ffd 100644
--- a/packages/api/src/client/types/chat/bsky/actor/declaration.ts
+++ b/packages/api/src/client/types/chat/bsky/actor/declaration.ts
@@ -2,24 +2,23 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'chat.bsky.actor.declaration'
 
 export interface Record {
   allowIncoming: 'all' | 'none' | 'following' | (string & {})
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'chat.bsky.actor.declaration#main' ||
-      v.$type === 'chat.bsky.actor.declaration')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'chat.bsky.actor.declaration', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.actor.declaration#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/api/src/client/types/chat/bsky/actor/defs.ts b/packages/api/src/client/types/chat/bsky/actor/defs.ts
index 87aaac96218..405dadae7cd 100644
--- a/packages/api/src/client/types/chat/bsky/actor/defs.ts
+++ b/packages/api/src/client/types/chat/bsky/actor/defs.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const id = 'chat.bsky.actor.defs'
+
 export interface ProfileViewBasic {
   did: string
   handle: string
@@ -21,14 +23,15 @@ export interface ProfileViewBasic {
   [k: string]: unknown
 }
 
-export function isProfileViewBasic(v: unknown): v is ProfileViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.actor.defs#profileViewBasic'
-  )
+export function isProfileViewBasic(v: unknown): v is ProfileViewBasic & {
+  $type: $Type<'chat.bsky.actor.defs', 'profileViewBasic'>
+} {
+  return is$typed(v, id, 'profileViewBasic')
 }
 
-export function validateProfileViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.actor.defs#profileViewBasic', v)
+export function validateProfileViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileViewBasic`,
+    v,
+  ) as ValidationResult<ProfileViewBasic>
 }
diff --git a/packages/api/src/client/types/chat/bsky/actor/deleteAccount.ts b/packages/api/src/client/types/chat/bsky/actor/deleteAccount.ts
index 1a045c21c29..c96bdf96729 100644
--- a/packages/api/src/client/types/chat/bsky/actor/deleteAccount.ts
+++ b/packages/api/src/client/types/chat/bsky/actor/deleteAccount.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'chat.bsky.actor.deleteAccount'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/chat/bsky/actor/exportAccountData.ts b/packages/api/src/client/types/chat/bsky/actor/exportAccountData.ts
index 0142436b05e..21d7bb32b26 100644
--- a/packages/api/src/client/types/chat/bsky/actor/exportAccountData.ts
+++ b/packages/api/src/client/types/chat/bsky/actor/exportAccountData.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'chat.bsky.actor.exportAccountData'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/chat/bsky/convo/defs.ts b/packages/api/src/client/types/chat/bsky/convo/defs.ts
index 4908b2dc46a..4b08ce380ab 100644
--- a/packages/api/src/client/types/chat/bsky/convo/defs.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/defs.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyRichtextFacet from '../../../app/bsky/richtext/facet'
 import * as AppBskyEmbedRecord from '../../../app/bsky/embed/record'
 import * as ChatBskyActorDefs from '../actor/defs'
 
+const id = 'chat.bsky.convo.defs'
+
 export interface MessageRef {
   did: string
   convoId: string
@@ -16,16 +18,17 @@ export interface MessageRef {
   [k: string]: unknown
 }
 
-export function isMessageRef(v: unknown): v is MessageRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageRef'
-  )
+export function isMessageRef(
+  v: unknown,
+): v is MessageRef & { $type: $Type<'chat.bsky.convo.defs', 'messageRef'> } {
+  return is$typed(v, id, 'messageRef')
 }
 
-export function validateMessageRef(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageRef', v)
+export function validateMessageRef(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageRef`,
+    v,
+  ) as ValidationResult<MessageRef>
 }
 
 export interface MessageInput {
@@ -36,16 +39,17 @@ export interface MessageInput {
   [k: string]: unknown
 }
 
-export function isMessageInput(v: unknown): v is MessageInput {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageInput'
-  )
+export function isMessageInput(v: unknown): v is MessageInput & {
+  $type: $Type<'chat.bsky.convo.defs', 'messageInput'>
+} {
+  return is$typed(v, id, 'messageInput')
 }
 
-export function validateMessageInput(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageInput', v)
+export function validateMessageInput(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageInput`,
+    v,
+  ) as ValidationResult<MessageInput>
 }
 
 export interface MessageView {
@@ -60,16 +64,17 @@ export interface MessageView {
   [k: string]: unknown
 }
 
-export function isMessageView(v: unknown): v is MessageView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageView'
-  )
+export function isMessageView(
+  v: unknown,
+): v is MessageView & { $type: $Type<'chat.bsky.convo.defs', 'messageView'> } {
+  return is$typed(v, id, 'messageView')
 }
 
-export function validateMessageView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageView', v)
+export function validateMessageView(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageView`,
+    v,
+  ) as ValidationResult<MessageView>
 }
 
 export interface DeletedMessageView {
@@ -80,16 +85,17 @@ export interface DeletedMessageView {
   [k: string]: unknown
 }
 
-export function isDeletedMessageView(v: unknown): v is DeletedMessageView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#deletedMessageView'
-  )
+export function isDeletedMessageView(v: unknown): v is DeletedMessageView & {
+  $type: $Type<'chat.bsky.convo.defs', 'deletedMessageView'>
+} {
+  return is$typed(v, id, 'deletedMessageView')
 }
 
-export function validateDeletedMessageView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#deletedMessageView', v)
+export function validateDeletedMessageView(v: unknown) {
+  return lexicons.validate(
+    `${id}#deletedMessageView`,
+    v,
+  ) as ValidationResult<DeletedMessageView>
 }
 
 export interface MessageViewSender {
@@ -97,16 +103,17 @@ export interface MessageViewSender {
   [k: string]: unknown
 }
 
-export function isMessageViewSender(v: unknown): v is MessageViewSender {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageViewSender'
-  )
+export function isMessageViewSender(v: unknown): v is MessageViewSender & {
+  $type: $Type<'chat.bsky.convo.defs', 'messageViewSender'>
+} {
+  return is$typed(v, id, 'messageViewSender')
 }
 
-export function validateMessageViewSender(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageViewSender', v)
+export function validateMessageViewSender(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageViewSender`,
+    v,
+  ) as ValidationResult<MessageViewSender>
 }
 
 export interface ConvoView {
@@ -123,16 +130,14 @@ export interface ConvoView {
   [k: string]: unknown
 }
 
-export function isConvoView(v: unknown): v is ConvoView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#convoView'
-  )
+export function isConvoView(
+  v: unknown,
+): v is ConvoView & { $type: $Type<'chat.bsky.convo.defs', 'convoView'> } {
+  return is$typed(v, id, 'convoView')
 }
 
-export function validateConvoView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#convoView', v)
+export function validateConvoView(v: unknown) {
+  return lexicons.validate(`${id}#convoView`, v) as ValidationResult<ConvoView>
 }
 
 export interface LogBeginConvo {
@@ -141,16 +146,17 @@ export interface LogBeginConvo {
   [k: string]: unknown
 }
 
-export function isLogBeginConvo(v: unknown): v is LogBeginConvo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logBeginConvo'
-  )
+export function isLogBeginConvo(v: unknown): v is LogBeginConvo & {
+  $type: $Type<'chat.bsky.convo.defs', 'logBeginConvo'>
+} {
+  return is$typed(v, id, 'logBeginConvo')
 }
 
-export function validateLogBeginConvo(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logBeginConvo', v)
+export function validateLogBeginConvo(v: unknown) {
+  return lexicons.validate(
+    `${id}#logBeginConvo`,
+    v,
+  ) as ValidationResult<LogBeginConvo>
 }
 
 export interface LogLeaveConvo {
@@ -159,16 +165,17 @@ export interface LogLeaveConvo {
   [k: string]: unknown
 }
 
-export function isLogLeaveConvo(v: unknown): v is LogLeaveConvo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logLeaveConvo'
-  )
+export function isLogLeaveConvo(v: unknown): v is LogLeaveConvo & {
+  $type: $Type<'chat.bsky.convo.defs', 'logLeaveConvo'>
+} {
+  return is$typed(v, id, 'logLeaveConvo')
 }
 
-export function validateLogLeaveConvo(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logLeaveConvo', v)
+export function validateLogLeaveConvo(v: unknown) {
+  return lexicons.validate(
+    `${id}#logLeaveConvo`,
+    v,
+  ) as ValidationResult<LogLeaveConvo>
 }
 
 export interface LogCreateMessage {
@@ -181,16 +188,17 @@ export interface LogCreateMessage {
   [k: string]: unknown
 }
 
-export function isLogCreateMessage(v: unknown): v is LogCreateMessage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logCreateMessage'
-  )
+export function isLogCreateMessage(v: unknown): v is LogCreateMessage & {
+  $type: $Type<'chat.bsky.convo.defs', 'logCreateMessage'>
+} {
+  return is$typed(v, id, 'logCreateMessage')
 }
 
-export function validateLogCreateMessage(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logCreateMessage', v)
+export function validateLogCreateMessage(v: unknown) {
+  return lexicons.validate(
+    `${id}#logCreateMessage`,
+    v,
+  ) as ValidationResult<LogCreateMessage>
 }
 
 export interface LogDeleteMessage {
@@ -203,14 +211,15 @@ export interface LogDeleteMessage {
   [k: string]: unknown
 }
 
-export function isLogDeleteMessage(v: unknown): v is LogDeleteMessage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logDeleteMessage'
-  )
+export function isLogDeleteMessage(v: unknown): v is LogDeleteMessage & {
+  $type: $Type<'chat.bsky.convo.defs', 'logDeleteMessage'>
+} {
+  return is$typed(v, id, 'logDeleteMessage')
 }
 
-export function validateLogDeleteMessage(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logDeleteMessage', v)
+export function validateLogDeleteMessage(v: unknown) {
+  return lexicons.validate(
+    `${id}#logDeleteMessage`,
+    v,
+  ) as ValidationResult<LogDeleteMessage>
 }
diff --git a/packages/api/src/client/types/chat/bsky/convo/deleteMessageForSelf.ts b/packages/api/src/client/types/chat/bsky/convo/deleteMessageForSelf.ts
index 863d2208cb8..0679a4fe677 100644
--- a/packages/api/src/client/types/chat/bsky/convo/deleteMessageForSelf.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/deleteMessageForSelf.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.deleteMessageForSelf'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/api/src/client/types/chat/bsky/convo/getConvo.ts b/packages/api/src/client/types/chat/bsky/convo/getConvo.ts
index b3834234b5f..ba605729939 100644
--- a/packages/api/src/client/types/chat/bsky/convo/getConvo.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/getConvo.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.getConvo'
+
 export interface QueryParams {
   convoId: string
 }
diff --git a/packages/api/src/client/types/chat/bsky/convo/getConvoForMembers.ts b/packages/api/src/client/types/chat/bsky/convo/getConvoForMembers.ts
index 9db44887410..795845b7379 100644
--- a/packages/api/src/client/types/chat/bsky/convo/getConvoForMembers.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/getConvoForMembers.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.getConvoForMembers'
+
 export interface QueryParams {
   members: string[]
 }
diff --git a/packages/api/src/client/types/chat/bsky/convo/getLog.ts b/packages/api/src/client/types/chat/bsky/convo/getLog.ts
index f1470fd89ba..4185bc39c12 100644
--- a/packages/api/src/client/types/chat/bsky/convo/getLog.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/getLog.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.getLog'
+
 export interface QueryParams {
   cursor?: string
 }
diff --git a/packages/api/src/client/types/chat/bsky/convo/getMessages.ts b/packages/api/src/client/types/chat/bsky/convo/getMessages.ts
index eea7cba82e1..d9f043c8081 100644
--- a/packages/api/src/client/types/chat/bsky/convo/getMessages.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/getMessages.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.getMessages'
+
 export interface QueryParams {
   convoId: string
   limit?: number
diff --git a/packages/api/src/client/types/chat/bsky/convo/leaveConvo.ts b/packages/api/src/client/types/chat/bsky/convo/leaveConvo.ts
index 4124db1855d..5feed2d0ffb 100644
--- a/packages/api/src/client/types/chat/bsky/convo/leaveConvo.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/leaveConvo.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'chat.bsky.convo.leaveConvo'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/chat/bsky/convo/listConvos.ts b/packages/api/src/client/types/chat/bsky/convo/listConvos.ts
index 3cd1ad68516..19fcfc73554 100644
--- a/packages/api/src/client/types/chat/bsky/convo/listConvos.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/listConvos.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.listConvos'
+
 export interface QueryParams {
   limit?: number
   cursor?: string
diff --git a/packages/api/src/client/types/chat/bsky/convo/muteConvo.ts b/packages/api/src/client/types/chat/bsky/convo/muteConvo.ts
index 93ac8785db7..caf7dc9c4a7 100644
--- a/packages/api/src/client/types/chat/bsky/convo/muteConvo.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/muteConvo.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.muteConvo'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/api/src/client/types/chat/bsky/convo/sendMessage.ts b/packages/api/src/client/types/chat/bsky/convo/sendMessage.ts
index e260ba6eee0..b5749f68c49 100644
--- a/packages/api/src/client/types/chat/bsky/convo/sendMessage.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/sendMessage.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.sendMessage'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/api/src/client/types/chat/bsky/convo/sendMessageBatch.ts b/packages/api/src/client/types/chat/bsky/convo/sendMessageBatch.ts
index 68ff2711df5..448e6a695c4 100644
--- a/packages/api/src/client/types/chat/bsky/convo/sendMessageBatch.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/sendMessageBatch.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.sendMessageBatch'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -43,14 +45,12 @@ export interface BatchItem {
   [k: string]: unknown
 }
 
-export function isBatchItem(v: unknown): v is BatchItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.sendMessageBatch#batchItem'
-  )
+export function isBatchItem(v: unknown): v is BatchItem & {
+  $type: $Type<'chat.bsky.convo.sendMessageBatch', 'batchItem'>
+} {
+  return is$typed(v, id, 'batchItem')
 }
 
-export function validateBatchItem(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.sendMessageBatch#batchItem', v)
+export function validateBatchItem(v: unknown) {
+  return lexicons.validate(`${id}#batchItem`, v) as ValidationResult<BatchItem>
 }
diff --git a/packages/api/src/client/types/chat/bsky/convo/unmuteConvo.ts b/packages/api/src/client/types/chat/bsky/convo/unmuteConvo.ts
index 93ac8785db7..7bbf475d509 100644
--- a/packages/api/src/client/types/chat/bsky/convo/unmuteConvo.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/unmuteConvo.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.unmuteConvo'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/api/src/client/types/chat/bsky/convo/updateRead.ts b/packages/api/src/client/types/chat/bsky/convo/updateRead.ts
index b7a8041dbd7..a990b1d14bf 100644
--- a/packages/api/src/client/types/chat/bsky/convo/updateRead.ts
+++ b/packages/api/src/client/types/chat/bsky/convo/updateRead.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.updateRead'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/api/src/client/types/chat/bsky/moderation/getActorMetadata.ts b/packages/api/src/client/types/chat/bsky/moderation/getActorMetadata.ts
index 6761c9939b5..9e2b0789f2a 100644
--- a/packages/api/src/client/types/chat/bsky/moderation/getActorMetadata.ts
+++ b/packages/api/src/client/types/chat/bsky/moderation/getActorMetadata.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'chat.bsky.moderation.getActorMetadata'
 
 export interface QueryParams {
   actor: string
@@ -43,14 +45,12 @@ export interface Metadata {
   [k: string]: unknown
 }
 
-export function isMetadata(v: unknown): v is Metadata {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.moderation.getActorMetadata#metadata'
-  )
+export function isMetadata(v: unknown): v is Metadata & {
+  $type: $Type<'chat.bsky.moderation.getActorMetadata', 'metadata'>
+} {
+  return is$typed(v, id, 'metadata')
 }
 
-export function validateMetadata(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.moderation.getActorMetadata#metadata', v)
+export function validateMetadata(v: unknown) {
+  return lexicons.validate(`${id}#metadata`, v) as ValidationResult<Metadata>
 }
diff --git a/packages/api/src/client/types/chat/bsky/moderation/getMessageContext.ts b/packages/api/src/client/types/chat/bsky/moderation/getMessageContext.ts
index 2315bfd4ad8..5ac31fa6ea9 100644
--- a/packages/api/src/client/types/chat/bsky/moderation/getMessageContext.ts
+++ b/packages/api/src/client/types/chat/bsky/moderation/getMessageContext.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ChatBskyConvoDefs from '../convo/defs'
 
+const id = 'chat.bsky.moderation.getMessageContext'
+
 export interface QueryParams {
   /** Conversation that the message is from. NOTE: this field will eventually be required. */
   convoId?: string
diff --git a/packages/api/src/client/types/chat/bsky/moderation/updateActorAccess.ts b/packages/api/src/client/types/chat/bsky/moderation/updateActorAccess.ts
index d6f0205672e..daf01350424 100644
--- a/packages/api/src/client/types/chat/bsky/moderation/updateActorAccess.ts
+++ b/packages/api/src/client/types/chat/bsky/moderation/updateActorAccess.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'chat.bsky.moderation.updateActorAccess'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/admin/defs.ts b/packages/api/src/client/types/com/atproto/admin/defs.ts
index 26510680347..f9c218ab111 100644
--- a/packages/api/src/client/types/com/atproto/admin/defs.ts
+++ b/packages/api/src/client/types/com/atproto/admin/defs.ts
@@ -2,27 +2,30 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoServerDefs from '../server/defs'
 
+const id = 'com.atproto.admin.defs'
+
 export interface StatusAttr {
   applied: boolean
   ref?: string
   [k: string]: unknown
 }
 
-export function isStatusAttr(v: unknown): v is StatusAttr {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#statusAttr'
-  )
+export function isStatusAttr(
+  v: unknown,
+): v is StatusAttr & { $type: $Type<'com.atproto.admin.defs', 'statusAttr'> } {
+  return is$typed(v, id, 'statusAttr')
 }
 
-export function validateStatusAttr(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#statusAttr', v)
+export function validateStatusAttr(v: unknown) {
+  return lexicons.validate(
+    `${id}#statusAttr`,
+    v,
+  ) as ValidationResult<StatusAttr>
 }
 
 export interface AccountView {
@@ -41,16 +44,17 @@ export interface AccountView {
   [k: string]: unknown
 }
 
-export function isAccountView(v: unknown): v is AccountView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#accountView'
-  )
+export function isAccountView(v: unknown): v is AccountView & {
+  $type: $Type<'com.atproto.admin.defs', 'accountView'>
+} {
+  return is$typed(v, id, 'accountView')
 }
 
-export function validateAccountView(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#accountView', v)
+export function validateAccountView(v: unknown) {
+  return lexicons.validate(
+    `${id}#accountView`,
+    v,
+  ) as ValidationResult<AccountView>
 }
 
 export interface RepoRef {
@@ -58,16 +62,14 @@ export interface RepoRef {
   [k: string]: unknown
 }
 
-export function isRepoRef(v: unknown): v is RepoRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#repoRef'
-  )
+export function isRepoRef(
+  v: unknown,
+): v is RepoRef & { $type: $Type<'com.atproto.admin.defs', 'repoRef'> } {
+  return is$typed(v, id, 'repoRef')
 }
 
-export function validateRepoRef(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#repoRef', v)
+export function validateRepoRef(v: unknown) {
+  return lexicons.validate(`${id}#repoRef`, v) as ValidationResult<RepoRef>
 }
 
 export interface RepoBlobRef {
@@ -77,16 +79,17 @@ export interface RepoBlobRef {
   [k: string]: unknown
 }
 
-export function isRepoBlobRef(v: unknown): v is RepoBlobRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#repoBlobRef'
-  )
+export function isRepoBlobRef(v: unknown): v is RepoBlobRef & {
+  $type: $Type<'com.atproto.admin.defs', 'repoBlobRef'>
+} {
+  return is$typed(v, id, 'repoBlobRef')
 }
 
-export function validateRepoBlobRef(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#repoBlobRef', v)
+export function validateRepoBlobRef(v: unknown) {
+  return lexicons.validate(
+    `${id}#repoBlobRef`,
+    v,
+  ) as ValidationResult<RepoBlobRef>
 }
 
 export interface ThreatSignature {
@@ -95,14 +98,15 @@ export interface ThreatSignature {
   [k: string]: unknown
 }
 
-export function isThreatSignature(v: unknown): v is ThreatSignature {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#threatSignature'
-  )
+export function isThreatSignature(v: unknown): v is ThreatSignature & {
+  $type: $Type<'com.atproto.admin.defs', 'threatSignature'>
+} {
+  return is$typed(v, id, 'threatSignature')
 }
 
-export function validateThreatSignature(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#threatSignature', v)
+export function validateThreatSignature(v: unknown) {
+  return lexicons.validate(
+    `${id}#threatSignature`,
+    v,
+  ) as ValidationResult<ThreatSignature>
 }
diff --git a/packages/api/src/client/types/com/atproto/admin/deleteAccount.ts b/packages/api/src/client/types/com/atproto/admin/deleteAccount.ts
index 72066a656b7..ad77e52f254 100644
--- a/packages/api/src/client/types/com/atproto/admin/deleteAccount.ts
+++ b/packages/api/src/client/types/com/atproto/admin/deleteAccount.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.admin.deleteAccount'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/admin/disableAccountInvites.ts b/packages/api/src/client/types/com/atproto/admin/disableAccountInvites.ts
index 8df420239de..0be94798622 100644
--- a/packages/api/src/client/types/com/atproto/admin/disableAccountInvites.ts
+++ b/packages/api/src/client/types/com/atproto/admin/disableAccountInvites.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.admin.disableAccountInvites'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/admin/disableInviteCodes.ts b/packages/api/src/client/types/com/atproto/admin/disableInviteCodes.ts
index c264b65dbc2..20149d69098 100644
--- a/packages/api/src/client/types/com/atproto/admin/disableInviteCodes.ts
+++ b/packages/api/src/client/types/com/atproto/admin/disableInviteCodes.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.admin.disableInviteCodes'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/admin/enableAccountInvites.ts b/packages/api/src/client/types/com/atproto/admin/enableAccountInvites.ts
index 094b3dfe0af..f98d75f0638 100644
--- a/packages/api/src/client/types/com/atproto/admin/enableAccountInvites.ts
+++ b/packages/api/src/client/types/com/atproto/admin/enableAccountInvites.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.admin.enableAccountInvites'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/admin/getAccountInfo.ts b/packages/api/src/client/types/com/atproto/admin/getAccountInfo.ts
index 645b9e613ff..b99538478f3 100644
--- a/packages/api/src/client/types/com/atproto/admin/getAccountInfo.ts
+++ b/packages/api/src/client/types/com/atproto/admin/getAccountInfo.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoAdminDefs from './defs'
 
+const id = 'com.atproto.admin.getAccountInfo'
+
 export interface QueryParams {
   did: string
 }
diff --git a/packages/api/src/client/types/com/atproto/admin/getAccountInfos.ts b/packages/api/src/client/types/com/atproto/admin/getAccountInfos.ts
index 9c1c273b9d9..f92ab95b675 100644
--- a/packages/api/src/client/types/com/atproto/admin/getAccountInfos.ts
+++ b/packages/api/src/client/types/com/atproto/admin/getAccountInfos.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoAdminDefs from './defs'
 
+const id = 'com.atproto.admin.getAccountInfos'
+
 export interface QueryParams {
   dids: string[]
 }
diff --git a/packages/api/src/client/types/com/atproto/admin/getInviteCodes.ts b/packages/api/src/client/types/com/atproto/admin/getInviteCodes.ts
index faa4c8bed25..dba73561108 100644
--- a/packages/api/src/client/types/com/atproto/admin/getInviteCodes.ts
+++ b/packages/api/src/client/types/com/atproto/admin/getInviteCodes.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoServerDefs from '../server/defs'
 
+const id = 'com.atproto.admin.getInviteCodes'
+
 export interface QueryParams {
   sort?: 'recent' | 'usage' | (string & {})
   limit?: number
diff --git a/packages/api/src/client/types/com/atproto/admin/getSubjectStatus.ts b/packages/api/src/client/types/com/atproto/admin/getSubjectStatus.ts
index f11b514507d..771b3aeb8fa 100644
--- a/packages/api/src/client/types/com/atproto/admin/getSubjectStatus.ts
+++ b/packages/api/src/client/types/com/atproto/admin/getSubjectStatus.ts
@@ -3,12 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoAdminDefs from './defs'
 import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+const id = 'com.atproto.admin.getSubjectStatus'
+
 export interface QueryParams {
   did?: string
   uri?: string
diff --git a/packages/api/src/client/types/com/atproto/admin/searchAccounts.ts b/packages/api/src/client/types/com/atproto/admin/searchAccounts.ts
index 2d22806238c..861e1db3b48 100644
--- a/packages/api/src/client/types/com/atproto/admin/searchAccounts.ts
+++ b/packages/api/src/client/types/com/atproto/admin/searchAccounts.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoAdminDefs from './defs'
 
+const id = 'com.atproto.admin.searchAccounts'
+
 export interface QueryParams {
   email?: string
   cursor?: string
diff --git a/packages/api/src/client/types/com/atproto/admin/sendEmail.ts b/packages/api/src/client/types/com/atproto/admin/sendEmail.ts
index 3f7c06d7070..55ac6dbf24b 100644
--- a/packages/api/src/client/types/com/atproto/admin/sendEmail.ts
+++ b/packages/api/src/client/types/com/atproto/admin/sendEmail.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.admin.sendEmail'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/admin/updateAccountEmail.ts b/packages/api/src/client/types/com/atproto/admin/updateAccountEmail.ts
index d13878711a6..99a48490a6d 100644
--- a/packages/api/src/client/types/com/atproto/admin/updateAccountEmail.ts
+++ b/packages/api/src/client/types/com/atproto/admin/updateAccountEmail.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.admin.updateAccountEmail'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/admin/updateAccountHandle.ts b/packages/api/src/client/types/com/atproto/admin/updateAccountHandle.ts
index 38fbcae1681..974144910ee 100644
--- a/packages/api/src/client/types/com/atproto/admin/updateAccountHandle.ts
+++ b/packages/api/src/client/types/com/atproto/admin/updateAccountHandle.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.admin.updateAccountHandle'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/admin/updateAccountPassword.ts b/packages/api/src/client/types/com/atproto/admin/updateAccountPassword.ts
index 412f0facca2..5c06c7f0df0 100644
--- a/packages/api/src/client/types/com/atproto/admin/updateAccountPassword.ts
+++ b/packages/api/src/client/types/com/atproto/admin/updateAccountPassword.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.admin.updateAccountPassword'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/admin/updateSubjectStatus.ts b/packages/api/src/client/types/com/atproto/admin/updateSubjectStatus.ts
index d890993cf3a..977ff64ab4e 100644
--- a/packages/api/src/client/types/com/atproto/admin/updateSubjectStatus.ts
+++ b/packages/api/src/client/types/com/atproto/admin/updateSubjectStatus.ts
@@ -3,12 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoAdminDefs from './defs'
 import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+const id = 'com.atproto.admin.updateSubjectStatus'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/api/src/client/types/com/atproto/identity/getRecommendedDidCredentials.ts b/packages/api/src/client/types/com/atproto/identity/getRecommendedDidCredentials.ts
index a5e4a0296de..040338ae5e9 100644
--- a/packages/api/src/client/types/com/atproto/identity/getRecommendedDidCredentials.ts
+++ b/packages/api/src/client/types/com/atproto/identity/getRecommendedDidCredentials.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.identity.getRecommendedDidCredentials'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/identity/requestPlcOperationSignature.ts b/packages/api/src/client/types/com/atproto/identity/requestPlcOperationSignature.ts
index dcab71e2558..e3dccdc0b20 100644
--- a/packages/api/src/client/types/com/atproto/identity/requestPlcOperationSignature.ts
+++ b/packages/api/src/client/types/com/atproto/identity/requestPlcOperationSignature.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.identity.requestPlcOperationSignature'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/identity/resolveHandle.ts b/packages/api/src/client/types/com/atproto/identity/resolveHandle.ts
index 32db72138f7..afc0829e338 100644
--- a/packages/api/src/client/types/com/atproto/identity/resolveHandle.ts
+++ b/packages/api/src/client/types/com/atproto/identity/resolveHandle.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.identity.resolveHandle'
 
 export interface QueryParams {
   /** The handle to resolve. */
diff --git a/packages/api/src/client/types/com/atproto/identity/signPlcOperation.ts b/packages/api/src/client/types/com/atproto/identity/signPlcOperation.ts
index 88c04c5993c..3847e611a56 100644
--- a/packages/api/src/client/types/com/atproto/identity/signPlcOperation.ts
+++ b/packages/api/src/client/types/com/atproto/identity/signPlcOperation.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.identity.signPlcOperation'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/identity/submitPlcOperation.ts b/packages/api/src/client/types/com/atproto/identity/submitPlcOperation.ts
index 74dea9f196d..e1042ad1774 100644
--- a/packages/api/src/client/types/com/atproto/identity/submitPlcOperation.ts
+++ b/packages/api/src/client/types/com/atproto/identity/submitPlcOperation.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.identity.submitPlcOperation'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/identity/updateHandle.ts b/packages/api/src/client/types/com/atproto/identity/updateHandle.ts
index c01d4887a4a..9ff1845c051 100644
--- a/packages/api/src/client/types/com/atproto/identity/updateHandle.ts
+++ b/packages/api/src/client/types/com/atproto/identity/updateHandle.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.identity.updateHandle'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/label/defs.ts b/packages/api/src/client/types/com/atproto/label/defs.ts
index 131682e550c..dfc59333ea6 100644
--- a/packages/api/src/client/types/com/atproto/label/defs.ts
+++ b/packages/api/src/client/types/com/atproto/label/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.label.defs'
 
 /** Metadata tag on an atproto resource (eg, repo or record). */
 export interface Label {
@@ -29,16 +31,14 @@ export interface Label {
   [k: string]: unknown
 }
 
-export function isLabel(v: unknown): v is Label {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#label'
-  )
+export function isLabel(
+  v: unknown,
+): v is Label & { $type: $Type<'com.atproto.label.defs', 'label'> } {
+  return is$typed(v, id, 'label')
 }
 
-export function validateLabel(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#label', v)
+export function validateLabel(v: unknown) {
+  return lexicons.validate(`${id}#label`, v) as ValidationResult<Label>
 }
 
 /** Metadata tags on an atproto record, published by the author within the record. */
@@ -47,16 +47,17 @@ export interface SelfLabels {
   [k: string]: unknown
 }
 
-export function isSelfLabels(v: unknown): v is SelfLabels {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#selfLabels'
-  )
+export function isSelfLabels(
+  v: unknown,
+): v is SelfLabels & { $type: $Type<'com.atproto.label.defs', 'selfLabels'> } {
+  return is$typed(v, id, 'selfLabels')
 }
 
-export function validateSelfLabels(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#selfLabels', v)
+export function validateSelfLabels(v: unknown) {
+  return lexicons.validate(
+    `${id}#selfLabels`,
+    v,
+  ) as ValidationResult<SelfLabels>
 }
 
 /** Metadata tag on an atproto record, published by the author within the record. Note that schemas should use #selfLabels, not #selfLabel. */
@@ -66,16 +67,14 @@ export interface SelfLabel {
   [k: string]: unknown
 }
 
-export function isSelfLabel(v: unknown): v is SelfLabel {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#selfLabel'
-  )
+export function isSelfLabel(
+  v: unknown,
+): v is SelfLabel & { $type: $Type<'com.atproto.label.defs', 'selfLabel'> } {
+  return is$typed(v, id, 'selfLabel')
 }
 
-export function validateSelfLabel(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#selfLabel', v)
+export function validateSelfLabel(v: unknown) {
+  return lexicons.validate(`${id}#selfLabel`, v) as ValidationResult<SelfLabel>
 }
 
 /** Declares a label value and its expected interpretations and behaviors. */
@@ -94,16 +93,19 @@ export interface LabelValueDefinition {
   [k: string]: unknown
 }
 
-export function isLabelValueDefinition(v: unknown): v is LabelValueDefinition {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#labelValueDefinition'
-  )
+export function isLabelValueDefinition(
+  v: unknown,
+): v is LabelValueDefinition & {
+  $type: $Type<'com.atproto.label.defs', 'labelValueDefinition'>
+} {
+  return is$typed(v, id, 'labelValueDefinition')
 }
 
-export function validateLabelValueDefinition(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#labelValueDefinition', v)
+export function validateLabelValueDefinition(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelValueDefinition`,
+    v,
+  ) as ValidationResult<LabelValueDefinition>
 }
 
 /** Strings which describe the label in the UI, localized into a specific language. */
@@ -119,21 +121,17 @@ export interface LabelValueDefinitionStrings {
 
 export function isLabelValueDefinitionStrings(
   v: unknown,
-): v is LabelValueDefinitionStrings {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#labelValueDefinitionStrings'
-  )
+): v is LabelValueDefinitionStrings & {
+  $type: $Type<'com.atproto.label.defs', 'labelValueDefinitionStrings'>
+} {
+  return is$typed(v, id, 'labelValueDefinitionStrings')
 }
 
-export function validateLabelValueDefinitionStrings(
-  v: unknown,
-): ValidationResult {
+export function validateLabelValueDefinitionStrings(v: unknown) {
   return lexicons.validate(
-    'com.atproto.label.defs#labelValueDefinitionStrings',
+    `${id}#labelValueDefinitionStrings`,
     v,
-  )
+  ) as ValidationResult<LabelValueDefinitionStrings>
 }
 
 export type LabelValue =
diff --git a/packages/api/src/client/types/com/atproto/label/queryLabels.ts b/packages/api/src/client/types/com/atproto/label/queryLabels.ts
index 615770ec978..e5ed6be6630 100644
--- a/packages/api/src/client/types/com/atproto/label/queryLabels.ts
+++ b/packages/api/src/client/types/com/atproto/label/queryLabels.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoLabelDefs from './defs'
 
+const id = 'com.atproto.label.queryLabels'
+
 export interface QueryParams {
   /** List of AT URI patterns to match (boolean 'OR'). Each may be a prefix (ending with '*'; will match inclusive of the string leading to '*'), or a full URI. */
   uriPatterns: string[]
diff --git a/packages/api/src/client/types/com/atproto/label/subscribeLabels.ts b/packages/api/src/client/types/com/atproto/label/subscribeLabels.ts
index 044d4d83b30..5dcdf241820 100644
--- a/packages/api/src/client/types/com/atproto/label/subscribeLabels.ts
+++ b/packages/api/src/client/types/com/atproto/label/subscribeLabels.ts
@@ -3,27 +3,27 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoLabelDefs from './defs'
 
+const id = 'com.atproto.label.subscribeLabels'
+
 export interface Labels {
   seq: number
   labels: ComAtprotoLabelDefs.Label[]
   [k: string]: unknown
 }
 
-export function isLabels(v: unknown): v is Labels {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.subscribeLabels#labels'
-  )
+export function isLabels(v: unknown): v is Labels & {
+  $type: $Type<'com.atproto.label.subscribeLabels', 'labels'>
+} {
+  return is$typed(v, id, 'labels')
 }
 
-export function validateLabels(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.subscribeLabels#labels', v)
+export function validateLabels(v: unknown) {
+  return lexicons.validate(`${id}#labels`, v) as ValidationResult<Labels>
 }
 
 export interface Info {
@@ -32,14 +32,12 @@ export interface Info {
   [k: string]: unknown
 }
 
-export function isInfo(v: unknown): v is Info {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.subscribeLabels#info'
-  )
+export function isInfo(
+  v: unknown,
+): v is Info & { $type: $Type<'com.atproto.label.subscribeLabels', 'info'> } {
+  return is$typed(v, id, 'info')
 }
 
-export function validateInfo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.subscribeLabels#info', v)
+export function validateInfo(v: unknown) {
+  return lexicons.validate(`${id}#info`, v) as ValidationResult<Info>
 }
diff --git a/packages/api/src/client/types/com/atproto/moderation/createReport.ts b/packages/api/src/client/types/com/atproto/moderation/createReport.ts
index 16316f585d4..85a7598ca4b 100644
--- a/packages/api/src/client/types/com/atproto/moderation/createReport.ts
+++ b/packages/api/src/client/types/com/atproto/moderation/createReport.ts
@@ -3,13 +3,15 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoModerationDefs from './defs'
 import * as ComAtprotoAdminDefs from '../admin/defs'
 import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+const id = 'com.atproto.moderation.createReport'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/api/src/client/types/com/atproto/moderation/defs.ts b/packages/api/src/client/types/com/atproto/moderation/defs.ts
index 802cd2bc996..9e7a01d4a3b 100644
--- a/packages/api/src/client/types/com/atproto/moderation/defs.ts
+++ b/packages/api/src/client/types/com/atproto/moderation/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.moderation.defs'
 
 export type ReasonType =
   | 'com.atproto.moderation.defs#reasonSpam'
@@ -17,16 +19,16 @@ export type ReasonType =
   | (string & {})
 
 /** Spam: frequent unwanted promotion, replies, mentions */
-export const REASONSPAM = 'com.atproto.moderation.defs#reasonSpam'
+export const REASONSPAM = `${id}#reasonSpam`
 /** Direct violation of server rules, laws, terms of service */
-export const REASONVIOLATION = 'com.atproto.moderation.defs#reasonViolation'
+export const REASONVIOLATION = `${id}#reasonViolation`
 /** Misleading identity, affiliation, or content */
-export const REASONMISLEADING = 'com.atproto.moderation.defs#reasonMisleading'
+export const REASONMISLEADING = `${id}#reasonMisleading`
 /** Unwanted or mislabeled sexual content */
-export const REASONSEXUAL = 'com.atproto.moderation.defs#reasonSexual'
+export const REASONSEXUAL = `${id}#reasonSexual`
 /** Rude, harassing, explicit, or otherwise unwelcoming behavior */
-export const REASONRUDE = 'com.atproto.moderation.defs#reasonRude'
+export const REASONRUDE = `${id}#reasonRude`
 /** Other: reports not falling under another report category */
-export const REASONOTHER = 'com.atproto.moderation.defs#reasonOther'
+export const REASONOTHER = `${id}#reasonOther`
 /** Appeal: appeal a previously taken moderation action */
-export const REASONAPPEAL = 'com.atproto.moderation.defs#reasonAppeal'
+export const REASONAPPEAL = `${id}#reasonAppeal`
diff --git a/packages/api/src/client/types/com/atproto/repo/applyWrites.ts b/packages/api/src/client/types/com/atproto/repo/applyWrites.ts
index edebf199a44..a06dcc6e7a7 100644
--- a/packages/api/src/client/types/com/atproto/repo/applyWrites.ts
+++ b/packages/api/src/client/types/com/atproto/repo/applyWrites.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoRepoDefs from './defs'
 
+const id = 'com.atproto.repo.applyWrites'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -62,16 +64,14 @@ export interface Create {
   [k: string]: unknown
 }
 
-export function isCreate(v: unknown): v is Create {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#create'
-  )
+export function isCreate(
+  v: unknown,
+): v is Create & { $type: $Type<'com.atproto.repo.applyWrites', 'create'> } {
+  return is$typed(v, id, 'create')
 }
 
-export function validateCreate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#create', v)
+export function validateCreate(v: unknown) {
+  return lexicons.validate(`${id}#create`, v) as ValidationResult<Create>
 }
 
 /** Operation which updates an existing record. */
@@ -82,16 +82,14 @@ export interface Update {
   [k: string]: unknown
 }
 
-export function isUpdate(v: unknown): v is Update {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#update'
-  )
+export function isUpdate(
+  v: unknown,
+): v is Update & { $type: $Type<'com.atproto.repo.applyWrites', 'update'> } {
+  return is$typed(v, id, 'update')
 }
 
-export function validateUpdate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#update', v)
+export function validateUpdate(v: unknown) {
+  return lexicons.validate(`${id}#update`, v) as ValidationResult<Update>
 }
 
 /** Operation which deletes an existing record. */
@@ -101,16 +99,14 @@ export interface Delete {
   [k: string]: unknown
 }
 
-export function isDelete(v: unknown): v is Delete {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#delete'
-  )
+export function isDelete(
+  v: unknown,
+): v is Delete & { $type: $Type<'com.atproto.repo.applyWrites', 'delete'> } {
+  return is$typed(v, id, 'delete')
 }
 
-export function validateDelete(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#delete', v)
+export function validateDelete(v: unknown) {
+  return lexicons.validate(`${id}#delete`, v) as ValidationResult<Delete>
 }
 
 export interface CreateResult {
@@ -120,16 +116,17 @@ export interface CreateResult {
   [k: string]: unknown
 }
 
-export function isCreateResult(v: unknown): v is CreateResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#createResult'
-  )
+export function isCreateResult(v: unknown): v is CreateResult & {
+  $type: $Type<'com.atproto.repo.applyWrites', 'createResult'>
+} {
+  return is$typed(v, id, 'createResult')
 }
 
-export function validateCreateResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#createResult', v)
+export function validateCreateResult(v: unknown) {
+  return lexicons.validate(
+    `${id}#createResult`,
+    v,
+  ) as ValidationResult<CreateResult>
 }
 
 export interface UpdateResult {
@@ -139,30 +136,32 @@ export interface UpdateResult {
   [k: string]: unknown
 }
 
-export function isUpdateResult(v: unknown): v is UpdateResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#updateResult'
-  )
+export function isUpdateResult(v: unknown): v is UpdateResult & {
+  $type: $Type<'com.atproto.repo.applyWrites', 'updateResult'>
+} {
+  return is$typed(v, id, 'updateResult')
 }
 
-export function validateUpdateResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#updateResult', v)
+export function validateUpdateResult(v: unknown) {
+  return lexicons.validate(
+    `${id}#updateResult`,
+    v,
+  ) as ValidationResult<UpdateResult>
 }
 
 export interface DeleteResult {
   [k: string]: unknown
 }
 
-export function isDeleteResult(v: unknown): v is DeleteResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#deleteResult'
-  )
+export function isDeleteResult(v: unknown): v is DeleteResult & {
+  $type: $Type<'com.atproto.repo.applyWrites', 'deleteResult'>
+} {
+  return is$typed(v, id, 'deleteResult')
 }
 
-export function validateDeleteResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#deleteResult', v)
+export function validateDeleteResult(v: unknown) {
+  return lexicons.validate(
+    `${id}#deleteResult`,
+    v,
+  ) as ValidationResult<DeleteResult>
 }
diff --git a/packages/api/src/client/types/com/atproto/repo/createRecord.ts b/packages/api/src/client/types/com/atproto/repo/createRecord.ts
index b0f921ef986..4a4b2dfb1a1 100644
--- a/packages/api/src/client/types/com/atproto/repo/createRecord.ts
+++ b/packages/api/src/client/types/com/atproto/repo/createRecord.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoRepoDefs from './defs'
 
+const id = 'com.atproto.repo.createRecord'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/api/src/client/types/com/atproto/repo/defs.ts b/packages/api/src/client/types/com/atproto/repo/defs.ts
index d4dfaceabf3..ca790068a37 100644
--- a/packages/api/src/client/types/com/atproto/repo/defs.ts
+++ b/packages/api/src/client/types/com/atproto/repo/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.repo.defs'
 
 export interface CommitMeta {
   cid: string
@@ -12,14 +14,15 @@ export interface CommitMeta {
   [k: string]: unknown
 }
 
-export function isCommitMeta(v: unknown): v is CommitMeta {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.defs#commitMeta'
-  )
+export function isCommitMeta(
+  v: unknown,
+): v is CommitMeta & { $type: $Type<'com.atproto.repo.defs', 'commitMeta'> } {
+  return is$typed(v, id, 'commitMeta')
 }
 
-export function validateCommitMeta(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.defs#commitMeta', v)
+export function validateCommitMeta(v: unknown) {
+  return lexicons.validate(
+    `${id}#commitMeta`,
+    v,
+  ) as ValidationResult<CommitMeta>
 }
diff --git a/packages/api/src/client/types/com/atproto/repo/deleteRecord.ts b/packages/api/src/client/types/com/atproto/repo/deleteRecord.ts
index ed06cbc83fc..2d2a70cbca8 100644
--- a/packages/api/src/client/types/com/atproto/repo/deleteRecord.ts
+++ b/packages/api/src/client/types/com/atproto/repo/deleteRecord.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoRepoDefs from './defs'
 
+const id = 'com.atproto.repo.deleteRecord'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/api/src/client/types/com/atproto/repo/describeRepo.ts b/packages/api/src/client/types/com/atproto/repo/describeRepo.ts
index 9b3eb337b5c..cbd36a79dca 100644
--- a/packages/api/src/client/types/com/atproto/repo/describeRepo.ts
+++ b/packages/api/src/client/types/com/atproto/repo/describeRepo.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.repo.describeRepo'
 
 export interface QueryParams {
   /** The handle or DID of the repo. */
diff --git a/packages/api/src/client/types/com/atproto/repo/getRecord.ts b/packages/api/src/client/types/com/atproto/repo/getRecord.ts
index 85013fb7719..14c83189b50 100644
--- a/packages/api/src/client/types/com/atproto/repo/getRecord.ts
+++ b/packages/api/src/client/types/com/atproto/repo/getRecord.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.repo.getRecord'
 
 export interface QueryParams {
   /** The handle or DID of the repo. */
diff --git a/packages/api/src/client/types/com/atproto/repo/importRepo.ts b/packages/api/src/client/types/com/atproto/repo/importRepo.ts
index ad093e6ce93..6a5fc955574 100644
--- a/packages/api/src/client/types/com/atproto/repo/importRepo.ts
+++ b/packages/api/src/client/types/com/atproto/repo/importRepo.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.repo.importRepo'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/repo/listMissingBlobs.ts b/packages/api/src/client/types/com/atproto/repo/listMissingBlobs.ts
index 9043fd4e1fe..ed27c814d0c 100644
--- a/packages/api/src/client/types/com/atproto/repo/listMissingBlobs.ts
+++ b/packages/api/src/client/types/com/atproto/repo/listMissingBlobs.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.repo.listMissingBlobs'
 
 export interface QueryParams {
   limit?: number
@@ -41,14 +43,15 @@ export interface RecordBlob {
   [k: string]: unknown
 }
 
-export function isRecordBlob(v: unknown): v is RecordBlob {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.listMissingBlobs#recordBlob'
-  )
+export function isRecordBlob(v: unknown): v is RecordBlob & {
+  $type: $Type<'com.atproto.repo.listMissingBlobs', 'recordBlob'>
+} {
+  return is$typed(v, id, 'recordBlob')
 }
 
-export function validateRecordBlob(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.listMissingBlobs#recordBlob', v)
+export function validateRecordBlob(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordBlob`,
+    v,
+  ) as ValidationResult<RecordBlob>
 }
diff --git a/packages/api/src/client/types/com/atproto/repo/listRecords.ts b/packages/api/src/client/types/com/atproto/repo/listRecords.ts
index 4a97572f74d..0c77a31841c 100644
--- a/packages/api/src/client/types/com/atproto/repo/listRecords.ts
+++ b/packages/api/src/client/types/com/atproto/repo/listRecords.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.repo.listRecords'
 
 export interface QueryParams {
   /** The handle or DID of the repo. */
@@ -53,14 +55,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.listRecords#record'
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'com.atproto.repo.listRecords', 'record'> } {
+  return is$typed(v, id, 'record')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.listRecords#record', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#record`, v) as ValidationResult<Record>
 }
diff --git a/packages/api/src/client/types/com/atproto/repo/putRecord.ts b/packages/api/src/client/types/com/atproto/repo/putRecord.ts
index 9cadf9a2c4d..2879a071a69 100644
--- a/packages/api/src/client/types/com/atproto/repo/putRecord.ts
+++ b/packages/api/src/client/types/com/atproto/repo/putRecord.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoRepoDefs from './defs'
 
+const id = 'com.atproto.repo.putRecord'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/api/src/client/types/com/atproto/repo/strongRef.ts b/packages/api/src/client/types/com/atproto/repo/strongRef.ts
index a6734ba3a4a..78624a17cac 100644
--- a/packages/api/src/client/types/com/atproto/repo/strongRef.ts
+++ b/packages/api/src/client/types/com/atproto/repo/strongRef.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.repo.strongRef'
 
 export interface Main {
   uri: string
@@ -12,15 +14,12 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'com.atproto.repo.strongRef#main' ||
-      v.$type === 'com.atproto.repo.strongRef')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: $Type<'com.atproto.repo.strongRef', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.strongRef#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
diff --git a/packages/api/src/client/types/com/atproto/repo/uploadBlob.ts b/packages/api/src/client/types/com/atproto/repo/uploadBlob.ts
index 9931cc61e9d..924a3fb4b22 100644
--- a/packages/api/src/client/types/com/atproto/repo/uploadBlob.ts
+++ b/packages/api/src/client/types/com/atproto/repo/uploadBlob.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.repo.uploadBlob'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/server/activateAccount.ts b/packages/api/src/client/types/com/atproto/server/activateAccount.ts
index dcab71e2558..d0859098b9e 100644
--- a/packages/api/src/client/types/com/atproto/server/activateAccount.ts
+++ b/packages/api/src/client/types/com/atproto/server/activateAccount.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.server.activateAccount'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/server/checkAccountStatus.ts b/packages/api/src/client/types/com/atproto/server/checkAccountStatus.ts
index b527cca2b67..03213d9d250 100644
--- a/packages/api/src/client/types/com/atproto/server/checkAccountStatus.ts
+++ b/packages/api/src/client/types/com/atproto/server/checkAccountStatus.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.server.checkAccountStatus'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/server/confirmEmail.ts b/packages/api/src/client/types/com/atproto/server/confirmEmail.ts
index 488de314fd6..8a61ed74d98 100644
--- a/packages/api/src/client/types/com/atproto/server/confirmEmail.ts
+++ b/packages/api/src/client/types/com/atproto/server/confirmEmail.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.server.confirmEmail'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/server/createAccount.ts b/packages/api/src/client/types/com/atproto/server/createAccount.ts
index 5f0a8d6ad0f..5058c261e91 100644
--- a/packages/api/src/client/types/com/atproto/server/createAccount.ts
+++ b/packages/api/src/client/types/com/atproto/server/createAccount.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.server.createAccount'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/server/createAppPassword.ts b/packages/api/src/client/types/com/atproto/server/createAppPassword.ts
index 05ee6b1314e..2f2f52f87ee 100644
--- a/packages/api/src/client/types/com/atproto/server/createAppPassword.ts
+++ b/packages/api/src/client/types/com/atproto/server/createAppPassword.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.server.createAppPassword'
 
 export interface QueryParams {}
 
@@ -54,17 +56,15 @@ export interface AppPassword {
   [k: string]: unknown
 }
 
-export function isAppPassword(v: unknown): v is AppPassword {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.createAppPassword#appPassword'
-  )
+export function isAppPassword(v: unknown): v is AppPassword & {
+  $type: $Type<'com.atproto.server.createAppPassword', 'appPassword'>
+} {
+  return is$typed(v, id, 'appPassword')
 }
 
-export function validateAppPassword(v: unknown): ValidationResult {
+export function validateAppPassword(v: unknown) {
   return lexicons.validate(
-    'com.atproto.server.createAppPassword#appPassword',
+    `${id}#appPassword`,
     v,
-  )
+  ) as ValidationResult<AppPassword>
 }
diff --git a/packages/api/src/client/types/com/atproto/server/createInviteCode.ts b/packages/api/src/client/types/com/atproto/server/createInviteCode.ts
index 426fb538fb3..c9714e1554a 100644
--- a/packages/api/src/client/types/com/atproto/server/createInviteCode.ts
+++ b/packages/api/src/client/types/com/atproto/server/createInviteCode.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.server.createInviteCode'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/server/createInviteCodes.ts b/packages/api/src/client/types/com/atproto/server/createInviteCodes.ts
index f7908697a21..7b476ec2d30 100644
--- a/packages/api/src/client/types/com/atproto/server/createInviteCodes.ts
+++ b/packages/api/src/client/types/com/atproto/server/createInviteCodes.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.server.createInviteCodes'
 
 export interface QueryParams {}
 
@@ -44,17 +46,15 @@ export interface AccountCodes {
   [k: string]: unknown
 }
 
-export function isAccountCodes(v: unknown): v is AccountCodes {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.createInviteCodes#accountCodes'
-  )
+export function isAccountCodes(v: unknown): v is AccountCodes & {
+  $type: $Type<'com.atproto.server.createInviteCodes', 'accountCodes'>
+} {
+  return is$typed(v, id, 'accountCodes')
 }
 
-export function validateAccountCodes(v: unknown): ValidationResult {
+export function validateAccountCodes(v: unknown) {
   return lexicons.validate(
-    'com.atproto.server.createInviteCodes#accountCodes',
+    `${id}#accountCodes`,
     v,
-  )
+  ) as ValidationResult<AccountCodes>
 }
diff --git a/packages/api/src/client/types/com/atproto/server/createSession.ts b/packages/api/src/client/types/com/atproto/server/createSession.ts
index 3ac1194b36d..eddf6fc380a 100644
--- a/packages/api/src/client/types/com/atproto/server/createSession.ts
+++ b/packages/api/src/client/types/com/atproto/server/createSession.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.server.createSession'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/server/deactivateAccount.ts b/packages/api/src/client/types/com/atproto/server/deactivateAccount.ts
index 592380aa9cc..c026604b1d6 100644
--- a/packages/api/src/client/types/com/atproto/server/deactivateAccount.ts
+++ b/packages/api/src/client/types/com/atproto/server/deactivateAccount.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.server.deactivateAccount'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/server/defs.ts b/packages/api/src/client/types/com/atproto/server/defs.ts
index e6be3798909..0a7779e99a4 100644
--- a/packages/api/src/client/types/com/atproto/server/defs.ts
+++ b/packages/api/src/client/types/com/atproto/server/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.server.defs'
 
 export interface InviteCode {
   code: string
@@ -17,16 +19,17 @@ export interface InviteCode {
   [k: string]: unknown
 }
 
-export function isInviteCode(v: unknown): v is InviteCode {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.defs#inviteCode'
-  )
+export function isInviteCode(
+  v: unknown,
+): v is InviteCode & { $type: $Type<'com.atproto.server.defs', 'inviteCode'> } {
+  return is$typed(v, id, 'inviteCode')
 }
 
-export function validateInviteCode(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.defs#inviteCode', v)
+export function validateInviteCode(v: unknown) {
+  return lexicons.validate(
+    `${id}#inviteCode`,
+    v,
+  ) as ValidationResult<InviteCode>
 }
 
 export interface InviteCodeUse {
@@ -35,14 +38,15 @@ export interface InviteCodeUse {
   [k: string]: unknown
 }
 
-export function isInviteCodeUse(v: unknown): v is InviteCodeUse {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.defs#inviteCodeUse'
-  )
+export function isInviteCodeUse(v: unknown): v is InviteCodeUse & {
+  $type: $Type<'com.atproto.server.defs', 'inviteCodeUse'>
+} {
+  return is$typed(v, id, 'inviteCodeUse')
 }
 
-export function validateInviteCodeUse(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.defs#inviteCodeUse', v)
+export function validateInviteCodeUse(v: unknown) {
+  return lexicons.validate(
+    `${id}#inviteCodeUse`,
+    v,
+  ) as ValidationResult<InviteCodeUse>
 }
diff --git a/packages/api/src/client/types/com/atproto/server/deleteAccount.ts b/packages/api/src/client/types/com/atproto/server/deleteAccount.ts
index 1e76ce2972f..cfb2a008489 100644
--- a/packages/api/src/client/types/com/atproto/server/deleteAccount.ts
+++ b/packages/api/src/client/types/com/atproto/server/deleteAccount.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.server.deleteAccount'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/server/deleteSession.ts b/packages/api/src/client/types/com/atproto/server/deleteSession.ts
index dcab71e2558..afd107a8eb6 100644
--- a/packages/api/src/client/types/com/atproto/server/deleteSession.ts
+++ b/packages/api/src/client/types/com/atproto/server/deleteSession.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.server.deleteSession'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/server/describeServer.ts b/packages/api/src/client/types/com/atproto/server/describeServer.ts
index b2936e18125..392ee2ace5d 100644
--- a/packages/api/src/client/types/com/atproto/server/describeServer.ts
+++ b/packages/api/src/client/types/com/atproto/server/describeServer.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.server.describeServer'
 
 export interface QueryParams {}
 
@@ -45,16 +47,14 @@ export interface Links {
   [k: string]: unknown
 }
 
-export function isLinks(v: unknown): v is Links {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.describeServer#links'
-  )
+export function isLinks(
+  v: unknown,
+): v is Links & { $type: $Type<'com.atproto.server.describeServer', 'links'> } {
+  return is$typed(v, id, 'links')
 }
 
-export function validateLinks(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.describeServer#links', v)
+export function validateLinks(v: unknown) {
+  return lexicons.validate(`${id}#links`, v) as ValidationResult<Links>
 }
 
 export interface Contact {
@@ -62,14 +62,12 @@ export interface Contact {
   [k: string]: unknown
 }
 
-export function isContact(v: unknown): v is Contact {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.describeServer#contact'
-  )
+export function isContact(v: unknown): v is Contact & {
+  $type: $Type<'com.atproto.server.describeServer', 'contact'>
+} {
+  return is$typed(v, id, 'contact')
 }
 
-export function validateContact(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.describeServer#contact', v)
+export function validateContact(v: unknown) {
+  return lexicons.validate(`${id}#contact`, v) as ValidationResult<Contact>
 }
diff --git a/packages/api/src/client/types/com/atproto/server/getAccountInviteCodes.ts b/packages/api/src/client/types/com/atproto/server/getAccountInviteCodes.ts
index e6b688cea66..b4673c894d3 100644
--- a/packages/api/src/client/types/com/atproto/server/getAccountInviteCodes.ts
+++ b/packages/api/src/client/types/com/atproto/server/getAccountInviteCodes.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoServerDefs from './defs'
 
+const id = 'com.atproto.server.getAccountInviteCodes'
+
 export interface QueryParams {
   includeUsed?: boolean
   /** Controls whether any new 'earned' but not 'created' invites should be created. */
diff --git a/packages/api/src/client/types/com/atproto/server/getServiceAuth.ts b/packages/api/src/client/types/com/atproto/server/getServiceAuth.ts
index 41ea36e453e..737f3302dbb 100644
--- a/packages/api/src/client/types/com/atproto/server/getServiceAuth.ts
+++ b/packages/api/src/client/types/com/atproto/server/getServiceAuth.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.server.getServiceAuth'
 
 export interface QueryParams {
   /** The DID of the service that the token will be used to authenticate with */
diff --git a/packages/api/src/client/types/com/atproto/server/getSession.ts b/packages/api/src/client/types/com/atproto/server/getSession.ts
index 1e0837924cc..b1175d6d5a3 100644
--- a/packages/api/src/client/types/com/atproto/server/getSession.ts
+++ b/packages/api/src/client/types/com/atproto/server/getSession.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.server.getSession'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/server/listAppPasswords.ts b/packages/api/src/client/types/com/atproto/server/listAppPasswords.ts
index a6cf8dca707..7f69d643b45 100644
--- a/packages/api/src/client/types/com/atproto/server/listAppPasswords.ts
+++ b/packages/api/src/client/types/com/atproto/server/listAppPasswords.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.server.listAppPasswords'
 
 export interface QueryParams {}
 
@@ -48,14 +50,15 @@ export interface AppPassword {
   [k: string]: unknown
 }
 
-export function isAppPassword(v: unknown): v is AppPassword {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.listAppPasswords#appPassword'
-  )
+export function isAppPassword(v: unknown): v is AppPassword & {
+  $type: $Type<'com.atproto.server.listAppPasswords', 'appPassword'>
+} {
+  return is$typed(v, id, 'appPassword')
 }
 
-export function validateAppPassword(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.listAppPasswords#appPassword', v)
+export function validateAppPassword(v: unknown) {
+  return lexicons.validate(
+    `${id}#appPassword`,
+    v,
+  ) as ValidationResult<AppPassword>
 }
diff --git a/packages/api/src/client/types/com/atproto/server/refreshSession.ts b/packages/api/src/client/types/com/atproto/server/refreshSession.ts
index 24d0e9e0ccc..f5fee9f2325 100644
--- a/packages/api/src/client/types/com/atproto/server/refreshSession.ts
+++ b/packages/api/src/client/types/com/atproto/server/refreshSession.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.server.refreshSession'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/server/requestAccountDelete.ts b/packages/api/src/client/types/com/atproto/server/requestAccountDelete.ts
index dcab71e2558..34b2f39f6e0 100644
--- a/packages/api/src/client/types/com/atproto/server/requestAccountDelete.ts
+++ b/packages/api/src/client/types/com/atproto/server/requestAccountDelete.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.server.requestAccountDelete'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/server/requestEmailConfirmation.ts b/packages/api/src/client/types/com/atproto/server/requestEmailConfirmation.ts
index dcab71e2558..82df373be9b 100644
--- a/packages/api/src/client/types/com/atproto/server/requestEmailConfirmation.ts
+++ b/packages/api/src/client/types/com/atproto/server/requestEmailConfirmation.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.server.requestEmailConfirmation'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/server/requestEmailUpdate.ts b/packages/api/src/client/types/com/atproto/server/requestEmailUpdate.ts
index 1d51a212117..7b8e57b1ad3 100644
--- a/packages/api/src/client/types/com/atproto/server/requestEmailUpdate.ts
+++ b/packages/api/src/client/types/com/atproto/server/requestEmailUpdate.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.server.requestEmailUpdate'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/server/requestPasswordReset.ts b/packages/api/src/client/types/com/atproto/server/requestPasswordReset.ts
index c33e4f4b604..7dcbd543d05 100644
--- a/packages/api/src/client/types/com/atproto/server/requestPasswordReset.ts
+++ b/packages/api/src/client/types/com/atproto/server/requestPasswordReset.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.server.requestPasswordReset'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/server/reserveSigningKey.ts b/packages/api/src/client/types/com/atproto/server/reserveSigningKey.ts
index 05867a62537..17cba425af0 100644
--- a/packages/api/src/client/types/com/atproto/server/reserveSigningKey.ts
+++ b/packages/api/src/client/types/com/atproto/server/reserveSigningKey.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.server.reserveSigningKey'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/server/resetPassword.ts b/packages/api/src/client/types/com/atproto/server/resetPassword.ts
index fb9f38e8e91..9c93098dfb9 100644
--- a/packages/api/src/client/types/com/atproto/server/resetPassword.ts
+++ b/packages/api/src/client/types/com/atproto/server/resetPassword.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.server.resetPassword'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/server/revokeAppPassword.ts b/packages/api/src/client/types/com/atproto/server/revokeAppPassword.ts
index 2d77e055cb6..ae10caa7e18 100644
--- a/packages/api/src/client/types/com/atproto/server/revokeAppPassword.ts
+++ b/packages/api/src/client/types/com/atproto/server/revokeAppPassword.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.server.revokeAppPassword'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/server/updateEmail.ts b/packages/api/src/client/types/com/atproto/server/updateEmail.ts
index 1213f63c724..8d52c2446bc 100644
--- a/packages/api/src/client/types/com/atproto/server/updateEmail.ts
+++ b/packages/api/src/client/types/com/atproto/server/updateEmail.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.server.updateEmail'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/sync/getBlob.ts b/packages/api/src/client/types/com/atproto/sync/getBlob.ts
index 03318cf2fb0..d434b91aa3f 100644
--- a/packages/api/src/client/types/com/atproto/sync/getBlob.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getBlob.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.sync.getBlob'
 
 export interface QueryParams {
   /** The DID of the account. */
diff --git a/packages/api/src/client/types/com/atproto/sync/getBlocks.ts b/packages/api/src/client/types/com/atproto/sync/getBlocks.ts
index 20829a8075c..737cda35ba4 100644
--- a/packages/api/src/client/types/com/atproto/sync/getBlocks.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getBlocks.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.sync.getBlocks'
 
 export interface QueryParams {
   /** The DID of the repo. */
diff --git a/packages/api/src/client/types/com/atproto/sync/getCheckout.ts b/packages/api/src/client/types/com/atproto/sync/getCheckout.ts
index 86538474ed2..15ed26fc973 100644
--- a/packages/api/src/client/types/com/atproto/sync/getCheckout.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getCheckout.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.sync.getCheckout'
 
 export interface QueryParams {
   /** The DID of the repo. */
diff --git a/packages/api/src/client/types/com/atproto/sync/getHead.ts b/packages/api/src/client/types/com/atproto/sync/getHead.ts
index 0f273053833..8edb810cff9 100644
--- a/packages/api/src/client/types/com/atproto/sync/getHead.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getHead.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.sync.getHead'
 
 export interface QueryParams {
   /** The DID of the repo. */
diff --git a/packages/api/src/client/types/com/atproto/sync/getLatestCommit.ts b/packages/api/src/client/types/com/atproto/sync/getLatestCommit.ts
index b27f350430a..334ecd16a62 100644
--- a/packages/api/src/client/types/com/atproto/sync/getLatestCommit.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getLatestCommit.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.sync.getLatestCommit'
 
 export interface QueryParams {
   /** The DID of the repo. */
diff --git a/packages/api/src/client/types/com/atproto/sync/getRecord.ts b/packages/api/src/client/types/com/atproto/sync/getRecord.ts
index f88eb6ee70a..5aa0133fd8a 100644
--- a/packages/api/src/client/types/com/atproto/sync/getRecord.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getRecord.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.sync.getRecord'
 
 export interface QueryParams {
   /** The DID of the repo. */
diff --git a/packages/api/src/client/types/com/atproto/sync/getRepo.ts b/packages/api/src/client/types/com/atproto/sync/getRepo.ts
index 52c43f7de93..aced8c2bd22 100644
--- a/packages/api/src/client/types/com/atproto/sync/getRepo.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getRepo.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.sync.getRepo'
 
 export interface QueryParams {
   /** The DID of the repo. */
diff --git a/packages/api/src/client/types/com/atproto/sync/getRepoStatus.ts b/packages/api/src/client/types/com/atproto/sync/getRepoStatus.ts
index 619d65eb558..e208e3ed50c 100644
--- a/packages/api/src/client/types/com/atproto/sync/getRepoStatus.ts
+++ b/packages/api/src/client/types/com/atproto/sync/getRepoStatus.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.sync.getRepoStatus'
 
 export interface QueryParams {
   /** The DID of the repo. */
diff --git a/packages/api/src/client/types/com/atproto/sync/listBlobs.ts b/packages/api/src/client/types/com/atproto/sync/listBlobs.ts
index bf5a8f1f950..0e7f097d514 100644
--- a/packages/api/src/client/types/com/atproto/sync/listBlobs.ts
+++ b/packages/api/src/client/types/com/atproto/sync/listBlobs.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.sync.listBlobs'
 
 export interface QueryParams {
   /** The DID of the repo. */
diff --git a/packages/api/src/client/types/com/atproto/sync/listRepos.ts b/packages/api/src/client/types/com/atproto/sync/listRepos.ts
index 84a44654f0b..11cd0b9a341 100644
--- a/packages/api/src/client/types/com/atproto/sync/listRepos.ts
+++ b/packages/api/src/client/types/com/atproto/sync/listRepos.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.sync.listRepos'
 
 export interface QueryParams {
   limit?: number
@@ -46,14 +48,12 @@ export interface Repo {
   [k: string]: unknown
 }
 
-export function isRepo(v: unknown): v is Repo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.listRepos#repo'
-  )
+export function isRepo(
+  v: unknown,
+): v is Repo & { $type: $Type<'com.atproto.sync.listRepos', 'repo'> } {
+  return is$typed(v, id, 'repo')
 }
 
-export function validateRepo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.listRepos#repo', v)
+export function validateRepo(v: unknown) {
+  return lexicons.validate(`${id}#repo`, v) as ValidationResult<Repo>
 }
diff --git a/packages/api/src/client/types/com/atproto/sync/notifyOfUpdate.ts b/packages/api/src/client/types/com/atproto/sync/notifyOfUpdate.ts
index 30e24f8b5b9..86bad80f25f 100644
--- a/packages/api/src/client/types/com/atproto/sync/notifyOfUpdate.ts
+++ b/packages/api/src/client/types/com/atproto/sync/notifyOfUpdate.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.sync.notifyOfUpdate'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/sync/requestCrawl.ts b/packages/api/src/client/types/com/atproto/sync/requestCrawl.ts
index 0f5d78560cf..c3bfedd5445 100644
--- a/packages/api/src/client/types/com/atproto/sync/requestCrawl.ts
+++ b/packages/api/src/client/types/com/atproto/sync/requestCrawl.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.sync.requestCrawl'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/sync/subscribeRepos.ts b/packages/api/src/client/types/com/atproto/sync/subscribeRepos.ts
index eac07c9acc1..5ab1be428b3 100644
--- a/packages/api/src/client/types/com/atproto/sync/subscribeRepos.ts
+++ b/packages/api/src/client/types/com/atproto/sync/subscribeRepos.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.sync.subscribeRepos'
 
 /** Represents an update of repository state. Note that empty commits are allowed, which include no repo data changes, but an update to rev and signature. */
 export interface Commit {
@@ -34,16 +36,14 @@ export interface Commit {
   [k: string]: unknown
 }
 
-export function isCommit(v: unknown): v is Commit {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#commit'
-  )
+export function isCommit(
+  v: unknown,
+): v is Commit & { $type: $Type<'com.atproto.sync.subscribeRepos', 'commit'> } {
+  return is$typed(v, id, 'commit')
 }
 
-export function validateCommit(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#commit', v)
+export function validateCommit(v: unknown) {
+  return lexicons.validate(`${id}#commit`, v) as ValidationResult<Commit>
 }
 
 /** Represents a change to an account's identity. Could be an updated handle, signing key, or pds hosting endpoint. Serves as a prod to all downstream services to refresh their identity cache. */
@@ -56,16 +56,14 @@ export interface Identity {
   [k: string]: unknown
 }
 
-export function isIdentity(v: unknown): v is Identity {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#identity'
-  )
+export function isIdentity(v: unknown): v is Identity & {
+  $type: $Type<'com.atproto.sync.subscribeRepos', 'identity'>
+} {
+  return is$typed(v, id, 'identity')
 }
 
-export function validateIdentity(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#identity', v)
+export function validateIdentity(v: unknown) {
+  return lexicons.validate(`${id}#identity`, v) as ValidationResult<Identity>
 }
 
 /** Represents a change to an account's status on a host (eg, PDS or Relay). The semantics of this event are that the status is at the host which emitted the event, not necessarily that at the currently active PDS. Eg, a Relay takedown would emit a takedown with active=false, even if the PDS is still active. */
@@ -80,16 +78,14 @@ export interface Account {
   [k: string]: unknown
 }
 
-export function isAccount(v: unknown): v is Account {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#account'
-  )
+export function isAccount(v: unknown): v is Account & {
+  $type: $Type<'com.atproto.sync.subscribeRepos', 'account'>
+} {
+  return is$typed(v, id, 'account')
 }
 
-export function validateAccount(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#account', v)
+export function validateAccount(v: unknown) {
+  return lexicons.validate(`${id}#account`, v) as ValidationResult<Account>
 }
 
 /** DEPRECATED -- Use #identity event instead */
@@ -101,16 +97,14 @@ export interface Handle {
   [k: string]: unknown
 }
 
-export function isHandle(v: unknown): v is Handle {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#handle'
-  )
+export function isHandle(
+  v: unknown,
+): v is Handle & { $type: $Type<'com.atproto.sync.subscribeRepos', 'handle'> } {
+  return is$typed(v, id, 'handle')
 }
 
-export function validateHandle(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#handle', v)
+export function validateHandle(v: unknown) {
+  return lexicons.validate(`${id}#handle`, v) as ValidationResult<Handle>
 }
 
 /** DEPRECATED -- Use #account event instead */
@@ -122,16 +116,14 @@ export interface Migrate {
   [k: string]: unknown
 }
 
-export function isMigrate(v: unknown): v is Migrate {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#migrate'
-  )
+export function isMigrate(v: unknown): v is Migrate & {
+  $type: $Type<'com.atproto.sync.subscribeRepos', 'migrate'>
+} {
+  return is$typed(v, id, 'migrate')
 }
 
-export function validateMigrate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#migrate', v)
+export function validateMigrate(v: unknown) {
+  return lexicons.validate(`${id}#migrate`, v) as ValidationResult<Migrate>
 }
 
 /** DEPRECATED -- Use #account event instead */
@@ -142,16 +134,14 @@ export interface Tombstone {
   [k: string]: unknown
 }
 
-export function isTombstone(v: unknown): v is Tombstone {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#tombstone'
-  )
+export function isTombstone(v: unknown): v is Tombstone & {
+  $type: $Type<'com.atproto.sync.subscribeRepos', 'tombstone'>
+} {
+  return is$typed(v, id, 'tombstone')
 }
 
-export function validateTombstone(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#tombstone', v)
+export function validateTombstone(v: unknown) {
+  return lexicons.validate(`${id}#tombstone`, v) as ValidationResult<Tombstone>
 }
 
 export interface Info {
@@ -160,16 +150,14 @@ export interface Info {
   [k: string]: unknown
 }
 
-export function isInfo(v: unknown): v is Info {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#info'
-  )
+export function isInfo(
+  v: unknown,
+): v is Info & { $type: $Type<'com.atproto.sync.subscribeRepos', 'info'> } {
+  return is$typed(v, id, 'info')
 }
 
-export function validateInfo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#info', v)
+export function validateInfo(v: unknown) {
+  return lexicons.validate(`${id}#info`, v) as ValidationResult<Info>
 }
 
 /** A repo operation, ie a mutation of a single record. */
@@ -181,14 +169,12 @@ export interface RepoOp {
   [k: string]: unknown
 }
 
-export function isRepoOp(v: unknown): v is RepoOp {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#repoOp'
-  )
+export function isRepoOp(
+  v: unknown,
+): v is RepoOp & { $type: $Type<'com.atproto.sync.subscribeRepos', 'repoOp'> } {
+  return is$typed(v, id, 'repoOp')
 }
 
-export function validateRepoOp(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#repoOp', v)
+export function validateRepoOp(v: unknown) {
+  return lexicons.validate(`${id}#repoOp`, v) as ValidationResult<RepoOp>
 }
diff --git a/packages/api/src/client/types/com/atproto/temp/addReservedHandle.ts b/packages/api/src/client/types/com/atproto/temp/addReservedHandle.ts
index e86337519ee..0bccbba47dc 100644
--- a/packages/api/src/client/types/com/atproto/temp/addReservedHandle.ts
+++ b/packages/api/src/client/types/com/atproto/temp/addReservedHandle.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.temp.addReservedHandle'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/temp/checkSignupQueue.ts b/packages/api/src/client/types/com/atproto/temp/checkSignupQueue.ts
index 414e6ca565c..64f54444e4c 100644
--- a/packages/api/src/client/types/com/atproto/temp/checkSignupQueue.ts
+++ b/packages/api/src/client/types/com/atproto/temp/checkSignupQueue.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.temp.checkSignupQueue'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/com/atproto/temp/fetchLabels.ts b/packages/api/src/client/types/com/atproto/temp/fetchLabels.ts
index 0b1d2399f4b..2d1ff2e0483 100644
--- a/packages/api/src/client/types/com/atproto/temp/fetchLabels.ts
+++ b/packages/api/src/client/types/com/atproto/temp/fetchLabels.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoLabelDefs from '../label/defs'
 
+const id = 'com.atproto.temp.fetchLabels'
+
 export interface QueryParams {
   since?: number
   limit?: number
diff --git a/packages/api/src/client/types/com/atproto/temp/requestPhoneVerification.ts b/packages/api/src/client/types/com/atproto/temp/requestPhoneVerification.ts
index 5e0699cd374..350d5bb9e98 100644
--- a/packages/api/src/client/types/com/atproto/temp/requestPhoneVerification.ts
+++ b/packages/api/src/client/types/com/atproto/temp/requestPhoneVerification.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'com.atproto.temp.requestPhoneVerification'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/tools/ozone/communication/createTemplate.ts b/packages/api/src/client/types/tools/ozone/communication/createTemplate.ts
index e7d22b33604..c52616efd8c 100644
--- a/packages/api/src/client/types/tools/ozone/communication/createTemplate.ts
+++ b/packages/api/src/client/types/tools/ozone/communication/createTemplate.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneCommunicationDefs from './defs'
 
+const id = 'tools.ozone.communication.createTemplate'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/api/src/client/types/tools/ozone/communication/defs.ts b/packages/api/src/client/types/tools/ozone/communication/defs.ts
index 4cf61252d7a..450944e4304 100644
--- a/packages/api/src/client/types/tools/ozone/communication/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/communication/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'tools.ozone.communication.defs'
 
 export interface TemplateView {
   id: string
@@ -24,14 +26,15 @@ export interface TemplateView {
   [k: string]: unknown
 }
 
-export function isTemplateView(v: unknown): v is TemplateView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.communication.defs#templateView'
-  )
+export function isTemplateView(v: unknown): v is TemplateView & {
+  $type: $Type<'tools.ozone.communication.defs', 'templateView'>
+} {
+  return is$typed(v, id, 'templateView')
 }
 
-export function validateTemplateView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.communication.defs#templateView', v)
+export function validateTemplateView(v: unknown) {
+  return lexicons.validate(
+    `${id}#templateView`,
+    v,
+  ) as ValidationResult<TemplateView>
 }
diff --git a/packages/api/src/client/types/tools/ozone/communication/deleteTemplate.ts b/packages/api/src/client/types/tools/ozone/communication/deleteTemplate.ts
index 0fc74571563..ee4a9d10ce6 100644
--- a/packages/api/src/client/types/tools/ozone/communication/deleteTemplate.ts
+++ b/packages/api/src/client/types/tools/ozone/communication/deleteTemplate.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'tools.ozone.communication.deleteTemplate'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/tools/ozone/communication/listTemplates.ts b/packages/api/src/client/types/tools/ozone/communication/listTemplates.ts
index c10f1ee56ba..765ed10524b 100644
--- a/packages/api/src/client/types/tools/ozone/communication/listTemplates.ts
+++ b/packages/api/src/client/types/tools/ozone/communication/listTemplates.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneCommunicationDefs from './defs'
 
+const id = 'tools.ozone.communication.listTemplates'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/api/src/client/types/tools/ozone/communication/updateTemplate.ts b/packages/api/src/client/types/tools/ozone/communication/updateTemplate.ts
index 5d6184ff5f4..033bd342712 100644
--- a/packages/api/src/client/types/tools/ozone/communication/updateTemplate.ts
+++ b/packages/api/src/client/types/tools/ozone/communication/updateTemplate.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneCommunicationDefs from './defs'
 
+const id = 'tools.ozone.communication.updateTemplate'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/api/src/client/types/tools/ozone/moderation/defs.ts b/packages/api/src/client/types/tools/ozone/moderation/defs.ts
index 1fa1004b1fe..d11bb62e766 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/defs.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 import * as ChatBskyConvoDefs from '../../../chat/bsky/convo/defs'
@@ -12,6 +12,8 @@ import * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs'
 import * as ComAtprotoServerDefs from '../../../com/atproto/server/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const id = 'tools.ozone.moderation.defs'
+
 export interface ModEventView {
   id: number
   event:
@@ -47,16 +49,17 @@ export interface ModEventView {
   [k: string]: unknown
 }
 
-export function isModEventView(v: unknown): v is ModEventView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventView'
-  )
+export function isModEventView(v: unknown): v is ModEventView & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventView'>
+} {
+  return is$typed(v, id, 'modEventView')
 }
 
-export function validateModEventView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventView', v)
+export function validateModEventView(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventView`,
+    v,
+  ) as ValidationResult<ModEventView>
 }
 
 export interface ModEventViewDetail {
@@ -93,16 +96,17 @@ export interface ModEventViewDetail {
   [k: string]: unknown
 }
 
-export function isModEventViewDetail(v: unknown): v is ModEventViewDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventViewDetail'
-  )
+export function isModEventViewDetail(v: unknown): v is ModEventViewDetail & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventViewDetail'>
+} {
+  return is$typed(v, id, 'modEventViewDetail')
 }
 
-export function validateModEventViewDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventViewDetail', v)
+export function validateModEventViewDetail(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventViewDetail`,
+    v,
+  ) as ValidationResult<ModEventViewDetail>
 }
 
 export interface SubjectStatusView {
@@ -139,16 +143,17 @@ export interface SubjectStatusView {
   [k: string]: unknown
 }
 
-export function isSubjectStatusView(v: unknown): v is SubjectStatusView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#subjectStatusView'
-  )
+export function isSubjectStatusView(v: unknown): v is SubjectStatusView & {
+  $type: $Type<'tools.ozone.moderation.defs', 'subjectStatusView'>
+} {
+  return is$typed(v, id, 'subjectStatusView')
 }
 
-export function validateSubjectStatusView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#subjectStatusView', v)
+export function validateSubjectStatusView(v: unknown) {
+  return lexicons.validate(
+    `${id}#subjectStatusView`,
+    v,
+  ) as ValidationResult<SubjectStatusView>
 }
 
 export type SubjectReviewState =
@@ -159,13 +164,13 @@ export type SubjectReviewState =
   | (string & {})
 
 /** Moderator review status of a subject: Open. Indicates that the subject needs to be reviewed by a moderator */
-export const REVIEWOPEN = 'tools.ozone.moderation.defs#reviewOpen'
+export const REVIEWOPEN = `${id}#reviewOpen`
 /** Moderator review status of a subject: Escalated. Indicates that the subject was escalated for review by a moderator */
-export const REVIEWESCALATED = 'tools.ozone.moderation.defs#reviewEscalated'
+export const REVIEWESCALATED = `${id}#reviewEscalated`
 /** Moderator review status of a subject: Closed. Indicates that the subject was already reviewed and resolved by a moderator */
-export const REVIEWCLOSED = 'tools.ozone.moderation.defs#reviewClosed'
+export const REVIEWCLOSED = `${id}#reviewClosed`
 /** Moderator review status of a subject: Unnecessary. Indicates that the subject does not need a review at the moment but there is probably some moderation related metadata available for it */
-export const REVIEWNONE = 'tools.ozone.moderation.defs#reviewNone'
+export const REVIEWNONE = `${id}#reviewNone`
 
 /** Take down a subject permanently or temporarily */
 export interface ModEventTakedown {
@@ -177,16 +182,17 @@ export interface ModEventTakedown {
   [k: string]: unknown
 }
 
-export function isModEventTakedown(v: unknown): v is ModEventTakedown {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventTakedown'
-  )
+export function isModEventTakedown(v: unknown): v is ModEventTakedown & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventTakedown'>
+} {
+  return is$typed(v, id, 'modEventTakedown')
 }
 
-export function validateModEventTakedown(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventTakedown', v)
+export function validateModEventTakedown(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventTakedown`,
+    v,
+  ) as ValidationResult<ModEventTakedown>
 }
 
 /** Revert take down action on a subject */
@@ -198,19 +204,17 @@ export interface ModEventReverseTakedown {
 
 export function isModEventReverseTakedown(
   v: unknown,
-): v is ModEventReverseTakedown {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventReverseTakedown'
-  )
+): v is ModEventReverseTakedown & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventReverseTakedown'>
+} {
+  return is$typed(v, id, 'modEventReverseTakedown')
 }
 
-export function validateModEventReverseTakedown(v: unknown): ValidationResult {
+export function validateModEventReverseTakedown(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventReverseTakedown',
+    `${id}#modEventReverseTakedown`,
     v,
-  )
+  ) as ValidationResult<ModEventReverseTakedown>
 }
 
 /** Resolve appeal on a subject */
@@ -222,19 +226,17 @@ export interface ModEventResolveAppeal {
 
 export function isModEventResolveAppeal(
   v: unknown,
-): v is ModEventResolveAppeal {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventResolveAppeal'
-  )
+): v is ModEventResolveAppeal & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventResolveAppeal'>
+} {
+  return is$typed(v, id, 'modEventResolveAppeal')
 }
 
-export function validateModEventResolveAppeal(v: unknown): ValidationResult {
+export function validateModEventResolveAppeal(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventResolveAppeal',
+    `${id}#modEventResolveAppeal`,
     v,
-  )
+  ) as ValidationResult<ModEventResolveAppeal>
 }
 
 /** Add a comment to a subject */
@@ -245,16 +247,17 @@ export interface ModEventComment {
   [k: string]: unknown
 }
 
-export function isModEventComment(v: unknown): v is ModEventComment {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventComment'
-  )
+export function isModEventComment(v: unknown): v is ModEventComment & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventComment'>
+} {
+  return is$typed(v, id, 'modEventComment')
 }
 
-export function validateModEventComment(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventComment', v)
+export function validateModEventComment(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventComment`,
+    v,
+  ) as ValidationResult<ModEventComment>
 }
 
 /** Report a subject */
@@ -266,16 +269,17 @@ export interface ModEventReport {
   [k: string]: unknown
 }
 
-export function isModEventReport(v: unknown): v is ModEventReport {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventReport'
-  )
+export function isModEventReport(v: unknown): v is ModEventReport & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventReport'>
+} {
+  return is$typed(v, id, 'modEventReport')
 }
 
-export function validateModEventReport(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventReport', v)
+export function validateModEventReport(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventReport`,
+    v,
+  ) as ValidationResult<ModEventReport>
 }
 
 /** Apply/Negate labels on a subject */
@@ -286,16 +290,17 @@ export interface ModEventLabel {
   [k: string]: unknown
 }
 
-export function isModEventLabel(v: unknown): v is ModEventLabel {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventLabel'
-  )
+export function isModEventLabel(v: unknown): v is ModEventLabel & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventLabel'>
+} {
+  return is$typed(v, id, 'modEventLabel')
 }
 
-export function validateModEventLabel(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventLabel', v)
+export function validateModEventLabel(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventLabel`,
+    v,
+  ) as ValidationResult<ModEventLabel>
 }
 
 export interface ModEventAcknowledge {
@@ -305,16 +310,17 @@ export interface ModEventAcknowledge {
   [k: string]: unknown
 }
 
-export function isModEventAcknowledge(v: unknown): v is ModEventAcknowledge {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventAcknowledge'
-  )
+export function isModEventAcknowledge(v: unknown): v is ModEventAcknowledge & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventAcknowledge'>
+} {
+  return is$typed(v, id, 'modEventAcknowledge')
 }
 
-export function validateModEventAcknowledge(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventAcknowledge', v)
+export function validateModEventAcknowledge(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventAcknowledge`,
+    v,
+  ) as ValidationResult<ModEventAcknowledge>
 }
 
 export interface ModEventEscalate {
@@ -322,16 +328,17 @@ export interface ModEventEscalate {
   [k: string]: unknown
 }
 
-export function isModEventEscalate(v: unknown): v is ModEventEscalate {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventEscalate'
-  )
+export function isModEventEscalate(v: unknown): v is ModEventEscalate & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventEscalate'>
+} {
+  return is$typed(v, id, 'modEventEscalate')
 }
 
-export function validateModEventEscalate(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventEscalate', v)
+export function validateModEventEscalate(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventEscalate`,
+    v,
+  ) as ValidationResult<ModEventEscalate>
 }
 
 /** Mute incoming reports on a subject */
@@ -342,16 +349,17 @@ export interface ModEventMute {
   [k: string]: unknown
 }
 
-export function isModEventMute(v: unknown): v is ModEventMute {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventMute'
-  )
+export function isModEventMute(v: unknown): v is ModEventMute & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventMute'>
+} {
+  return is$typed(v, id, 'modEventMute')
 }
 
-export function validateModEventMute(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventMute', v)
+export function validateModEventMute(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventMute`,
+    v,
+  ) as ValidationResult<ModEventMute>
 }
 
 /** Unmute action on a subject */
@@ -361,16 +369,17 @@ export interface ModEventUnmute {
   [k: string]: unknown
 }
 
-export function isModEventUnmute(v: unknown): v is ModEventUnmute {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventUnmute'
-  )
+export function isModEventUnmute(v: unknown): v is ModEventUnmute & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventUnmute'>
+} {
+  return is$typed(v, id, 'modEventUnmute')
 }
 
-export function validateModEventUnmute(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventUnmute', v)
+export function validateModEventUnmute(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventUnmute`,
+    v,
+  ) as ValidationResult<ModEventUnmute>
 }
 
 /** Mute incoming reports from an account */
@@ -381,19 +390,19 @@ export interface ModEventMuteReporter {
   [k: string]: unknown
 }
 
-export function isModEventMuteReporter(v: unknown): v is ModEventMuteReporter {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventMuteReporter'
-  )
+export function isModEventMuteReporter(
+  v: unknown,
+): v is ModEventMuteReporter & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventMuteReporter'>
+} {
+  return is$typed(v, id, 'modEventMuteReporter')
 }
 
-export function validateModEventMuteReporter(v: unknown): ValidationResult {
+export function validateModEventMuteReporter(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventMuteReporter',
+    `${id}#modEventMuteReporter`,
     v,
-  )
+  ) as ValidationResult<ModEventMuteReporter>
 }
 
 /** Unmute incoming reports from an account */
@@ -405,19 +414,17 @@ export interface ModEventUnmuteReporter {
 
 export function isModEventUnmuteReporter(
   v: unknown,
-): v is ModEventUnmuteReporter {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventUnmuteReporter'
-  )
+): v is ModEventUnmuteReporter & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventUnmuteReporter'>
+} {
+  return is$typed(v, id, 'modEventUnmuteReporter')
 }
 
-export function validateModEventUnmuteReporter(v: unknown): ValidationResult {
+export function validateModEventUnmuteReporter(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventUnmuteReporter',
+    `${id}#modEventUnmuteReporter`,
     v,
-  )
+  ) as ValidationResult<ModEventUnmuteReporter>
 }
 
 /** Keep a log of outgoing email to a user */
@@ -431,16 +438,17 @@ export interface ModEventEmail {
   [k: string]: unknown
 }
 
-export function isModEventEmail(v: unknown): v is ModEventEmail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventEmail'
-  )
+export function isModEventEmail(v: unknown): v is ModEventEmail & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventEmail'>
+} {
+  return is$typed(v, id, 'modEventEmail')
 }
 
-export function validateModEventEmail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventEmail', v)
+export function validateModEventEmail(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventEmail`,
+    v,
+  ) as ValidationResult<ModEventEmail>
 }
 
 /** Divert a record's blobs to a 3rd party service for further scanning/tagging */
@@ -449,16 +457,17 @@ export interface ModEventDivert {
   [k: string]: unknown
 }
 
-export function isModEventDivert(v: unknown): v is ModEventDivert {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventDivert'
-  )
+export function isModEventDivert(v: unknown): v is ModEventDivert & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventDivert'>
+} {
+  return is$typed(v, id, 'modEventDivert')
 }
 
-export function validateModEventDivert(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventDivert', v)
+export function validateModEventDivert(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventDivert`,
+    v,
+  ) as ValidationResult<ModEventDivert>
 }
 
 /** Add/Remove a tag on a subject */
@@ -472,16 +481,17 @@ export interface ModEventTag {
   [k: string]: unknown
 }
 
-export function isModEventTag(v: unknown): v is ModEventTag {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventTag'
-  )
+export function isModEventTag(v: unknown): v is ModEventTag & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventTag'>
+} {
+  return is$typed(v, id, 'modEventTag')
 }
 
-export function validateModEventTag(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventTag', v)
+export function validateModEventTag(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventTag`,
+    v,
+  ) as ValidationResult<ModEventTag>
 }
 
 /** Logs account status related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
@@ -501,16 +511,17 @@ export interface AccountEvent {
   [k: string]: unknown
 }
 
-export function isAccountEvent(v: unknown): v is AccountEvent {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#accountEvent'
-  )
+export function isAccountEvent(v: unknown): v is AccountEvent & {
+  $type: $Type<'tools.ozone.moderation.defs', 'accountEvent'>
+} {
+  return is$typed(v, id, 'accountEvent')
 }
 
-export function validateAccountEvent(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#accountEvent', v)
+export function validateAccountEvent(v: unknown) {
+  return lexicons.validate(
+    `${id}#accountEvent`,
+    v,
+  ) as ValidationResult<AccountEvent>
 }
 
 /** Logs identity related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
@@ -523,16 +534,17 @@ export interface IdentityEvent {
   [k: string]: unknown
 }
 
-export function isIdentityEvent(v: unknown): v is IdentityEvent {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#identityEvent'
-  )
+export function isIdentityEvent(v: unknown): v is IdentityEvent & {
+  $type: $Type<'tools.ozone.moderation.defs', 'identityEvent'>
+} {
+  return is$typed(v, id, 'identityEvent')
 }
 
-export function validateIdentityEvent(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#identityEvent', v)
+export function validateIdentityEvent(v: unknown) {
+  return lexicons.validate(
+    `${id}#identityEvent`,
+    v,
+  ) as ValidationResult<IdentityEvent>
 }
 
 /** Logs lifecycle event on a record subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
@@ -544,16 +556,17 @@ export interface RecordEvent {
   [k: string]: unknown
 }
 
-export function isRecordEvent(v: unknown): v is RecordEvent {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordEvent'
-  )
+export function isRecordEvent(v: unknown): v is RecordEvent & {
+  $type: $Type<'tools.ozone.moderation.defs', 'recordEvent'>
+} {
+  return is$typed(v, id, 'recordEvent')
 }
 
-export function validateRecordEvent(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordEvent', v)
+export function validateRecordEvent(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordEvent`,
+    v,
+  ) as ValidationResult<RecordEvent>
 }
 
 export interface RepoView {
@@ -571,16 +584,14 @@ export interface RepoView {
   [k: string]: unknown
 }
 
-export function isRepoView(v: unknown): v is RepoView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#repoView'
-  )
+export function isRepoView(
+  v: unknown,
+): v is RepoView & { $type: $Type<'tools.ozone.moderation.defs', 'repoView'> } {
+  return is$typed(v, id, 'repoView')
 }
 
-export function validateRepoView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#repoView', v)
+export function validateRepoView(v: unknown) {
+  return lexicons.validate(`${id}#repoView`, v) as ValidationResult<RepoView>
 }
 
 export interface RepoViewDetail {
@@ -601,16 +612,17 @@ export interface RepoViewDetail {
   [k: string]: unknown
 }
 
-export function isRepoViewDetail(v: unknown): v is RepoViewDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#repoViewDetail'
-  )
+export function isRepoViewDetail(v: unknown): v is RepoViewDetail & {
+  $type: $Type<'tools.ozone.moderation.defs', 'repoViewDetail'>
+} {
+  return is$typed(v, id, 'repoViewDetail')
 }
 
-export function validateRepoViewDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#repoViewDetail', v)
+export function validateRepoViewDetail(v: unknown) {
+  return lexicons.validate(
+    `${id}#repoViewDetail`,
+    v,
+  ) as ValidationResult<RepoViewDetail>
 }
 
 export interface RepoViewNotFound {
@@ -618,16 +630,17 @@ export interface RepoViewNotFound {
   [k: string]: unknown
 }
 
-export function isRepoViewNotFound(v: unknown): v is RepoViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#repoViewNotFound'
-  )
+export function isRepoViewNotFound(v: unknown): v is RepoViewNotFound & {
+  $type: $Type<'tools.ozone.moderation.defs', 'repoViewNotFound'>
+} {
+  return is$typed(v, id, 'repoViewNotFound')
 }
 
-export function validateRepoViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#repoViewNotFound', v)
+export function validateRepoViewNotFound(v: unknown) {
+  return lexicons.validate(
+    `${id}#repoViewNotFound`,
+    v,
+  ) as ValidationResult<RepoViewNotFound>
 }
 
 export interface RecordView {
@@ -641,16 +654,17 @@ export interface RecordView {
   [k: string]: unknown
 }
 
-export function isRecordView(v: unknown): v is RecordView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordView'
-  )
+export function isRecordView(v: unknown): v is RecordView & {
+  $type: $Type<'tools.ozone.moderation.defs', 'recordView'>
+} {
+  return is$typed(v, id, 'recordView')
 }
 
-export function validateRecordView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordView', v)
+export function validateRecordView(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordView`,
+    v,
+  ) as ValidationResult<RecordView>
 }
 
 export interface RecordViewDetail {
@@ -665,16 +679,17 @@ export interface RecordViewDetail {
   [k: string]: unknown
 }
 
-export function isRecordViewDetail(v: unknown): v is RecordViewDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordViewDetail'
-  )
+export function isRecordViewDetail(v: unknown): v is RecordViewDetail & {
+  $type: $Type<'tools.ozone.moderation.defs', 'recordViewDetail'>
+} {
+  return is$typed(v, id, 'recordViewDetail')
 }
 
-export function validateRecordViewDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordViewDetail', v)
+export function validateRecordViewDetail(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordViewDetail`,
+    v,
+  ) as ValidationResult<RecordViewDetail>
 }
 
 export interface RecordViewNotFound {
@@ -682,16 +697,17 @@ export interface RecordViewNotFound {
   [k: string]: unknown
 }
 
-export function isRecordViewNotFound(v: unknown): v is RecordViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordViewNotFound'
-  )
+export function isRecordViewNotFound(v: unknown): v is RecordViewNotFound & {
+  $type: $Type<'tools.ozone.moderation.defs', 'recordViewNotFound'>
+} {
+  return is$typed(v, id, 'recordViewNotFound')
 }
 
-export function validateRecordViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordViewNotFound', v)
+export function validateRecordViewNotFound(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordViewNotFound`,
+    v,
+  ) as ValidationResult<RecordViewNotFound>
 }
 
 export interface Moderation {
@@ -699,16 +715,17 @@ export interface Moderation {
   [k: string]: unknown
 }
 
-export function isModeration(v: unknown): v is Moderation {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#moderation'
-  )
+export function isModeration(v: unknown): v is Moderation & {
+  $type: $Type<'tools.ozone.moderation.defs', 'moderation'>
+} {
+  return is$typed(v, id, 'moderation')
 }
 
-export function validateModeration(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#moderation', v)
+export function validateModeration(v: unknown) {
+  return lexicons.validate(
+    `${id}#moderation`,
+    v,
+  ) as ValidationResult<Moderation>
 }
 
 export interface ModerationDetail {
@@ -716,16 +733,17 @@ export interface ModerationDetail {
   [k: string]: unknown
 }
 
-export function isModerationDetail(v: unknown): v is ModerationDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#moderationDetail'
-  )
+export function isModerationDetail(v: unknown): v is ModerationDetail & {
+  $type: $Type<'tools.ozone.moderation.defs', 'moderationDetail'>
+} {
+  return is$typed(v, id, 'moderationDetail')
 }
 
-export function validateModerationDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#moderationDetail', v)
+export function validateModerationDetail(v: unknown) {
+  return lexicons.validate(
+    `${id}#moderationDetail`,
+    v,
+  ) as ValidationResult<ModerationDetail>
 }
 
 export interface BlobView {
@@ -741,16 +759,14 @@ export interface BlobView {
   [k: string]: unknown
 }
 
-export function isBlobView(v: unknown): v is BlobView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#blobView'
-  )
+export function isBlobView(
+  v: unknown,
+): v is BlobView & { $type: $Type<'tools.ozone.moderation.defs', 'blobView'> } {
+  return is$typed(v, id, 'blobView')
 }
 
-export function validateBlobView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#blobView', v)
+export function validateBlobView(v: unknown) {
+  return lexicons.validate(`${id}#blobView`, v) as ValidationResult<BlobView>
 }
 
 export interface ImageDetails {
@@ -759,16 +775,17 @@ export interface ImageDetails {
   [k: string]: unknown
 }
 
-export function isImageDetails(v: unknown): v is ImageDetails {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#imageDetails'
-  )
+export function isImageDetails(v: unknown): v is ImageDetails & {
+  $type: $Type<'tools.ozone.moderation.defs', 'imageDetails'>
+} {
+  return is$typed(v, id, 'imageDetails')
 }
 
-export function validateImageDetails(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#imageDetails', v)
+export function validateImageDetails(v: unknown) {
+  return lexicons.validate(
+    `${id}#imageDetails`,
+    v,
+  ) as ValidationResult<ImageDetails>
 }
 
 export interface VideoDetails {
@@ -778,16 +795,17 @@ export interface VideoDetails {
   [k: string]: unknown
 }
 
-export function isVideoDetails(v: unknown): v is VideoDetails {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#videoDetails'
-  )
+export function isVideoDetails(v: unknown): v is VideoDetails & {
+  $type: $Type<'tools.ozone.moderation.defs', 'videoDetails'>
+} {
+  return is$typed(v, id, 'videoDetails')
 }
 
-export function validateVideoDetails(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#videoDetails', v)
+export function validateVideoDetails(v: unknown) {
+  return lexicons.validate(
+    `${id}#videoDetails`,
+    v,
+  ) as ValidationResult<VideoDetails>
 }
 
 export interface AccountHosting {
@@ -806,16 +824,17 @@ export interface AccountHosting {
   [k: string]: unknown
 }
 
-export function isAccountHosting(v: unknown): v is AccountHosting {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#accountHosting'
-  )
+export function isAccountHosting(v: unknown): v is AccountHosting & {
+  $type: $Type<'tools.ozone.moderation.defs', 'accountHosting'>
+} {
+  return is$typed(v, id, 'accountHosting')
 }
 
-export function validateAccountHosting(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#accountHosting', v)
+export function validateAccountHosting(v: unknown) {
+  return lexicons.validate(
+    `${id}#accountHosting`,
+    v,
+  ) as ValidationResult<AccountHosting>
 }
 
 export interface RecordHosting {
@@ -826,14 +845,15 @@ export interface RecordHosting {
   [k: string]: unknown
 }
 
-export function isRecordHosting(v: unknown): v is RecordHosting {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordHosting'
-  )
+export function isRecordHosting(v: unknown): v is RecordHosting & {
+  $type: $Type<'tools.ozone.moderation.defs', 'recordHosting'>
+} {
+  return is$typed(v, id, 'recordHosting')
 }
 
-export function validateRecordHosting(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordHosting', v)
+export function validateRecordHosting(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordHosting`,
+    v,
+  ) as ValidationResult<RecordHosting>
 }
diff --git a/packages/api/src/client/types/tools/ozone/moderation/emitEvent.ts b/packages/api/src/client/types/tools/ozone/moderation/emitEvent.ts
index 56cf9279f0b..77db148d612 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/emitEvent.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/emitEvent.ts
@@ -3,13 +3,15 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneModerationDefs from './defs'
 import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const id = 'tools.ozone.moderation.emitEvent'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/api/src/client/types/tools/ozone/moderation/getEvent.ts b/packages/api/src/client/types/tools/ozone/moderation/getEvent.ts
index 7b1206d339f..784e2265a7b 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/getEvent.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/getEvent.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneModerationDefs from './defs'
 
+const id = 'tools.ozone.moderation.getEvent'
+
 export interface QueryParams {
   id: number
 }
diff --git a/packages/api/src/client/types/tools/ozone/moderation/getRecord.ts b/packages/api/src/client/types/tools/ozone/moderation/getRecord.ts
index fe1fc0b32c0..7766b4ed36f 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/getRecord.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/getRecord.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneModerationDefs from './defs'
 
+const id = 'tools.ozone.moderation.getRecord'
+
 export interface QueryParams {
   uri: string
   cid?: string
diff --git a/packages/api/src/client/types/tools/ozone/moderation/getRecords.ts b/packages/api/src/client/types/tools/ozone/moderation/getRecords.ts
index 1d7b8d669b6..524933a1c71 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/getRecords.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/getRecords.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneModerationDefs from './defs'
 
+const id = 'tools.ozone.moderation.getRecords'
+
 export interface QueryParams {
   uris: string[]
 }
diff --git a/packages/api/src/client/types/tools/ozone/moderation/getRepo.ts b/packages/api/src/client/types/tools/ozone/moderation/getRepo.ts
index ce26b50acf1..61c3398c19a 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/getRepo.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/getRepo.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneModerationDefs from './defs'
 
+const id = 'tools.ozone.moderation.getRepo'
+
 export interface QueryParams {
   did: string
 }
diff --git a/packages/api/src/client/types/tools/ozone/moderation/getRepos.ts b/packages/api/src/client/types/tools/ozone/moderation/getRepos.ts
index 17de1d06b35..bb761bc2cfb 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/getRepos.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/getRepos.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneModerationDefs from './defs'
 
+const id = 'tools.ozone.moderation.getRepos'
+
 export interface QueryParams {
   dids: string[]
 }
diff --git a/packages/api/src/client/types/tools/ozone/moderation/queryEvents.ts b/packages/api/src/client/types/tools/ozone/moderation/queryEvents.ts
index a73c5819ce4..9a0f7d0555c 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/queryEvents.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/queryEvents.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneModerationDefs from './defs'
 
+const id = 'tools.ozone.moderation.queryEvents'
+
 export interface QueryParams {
   /** The types of events (fully qualified string in the format of tools.ozone.moderation.defs#modEvent<name>) to filter by. If not specified, all events are returned. */
   types?: string[]
diff --git a/packages/api/src/client/types/tools/ozone/moderation/queryStatuses.ts b/packages/api/src/client/types/tools/ozone/moderation/queryStatuses.ts
index 2db3b9c0a60..bb912f1f905 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/queryStatuses.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/queryStatuses.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneModerationDefs from './defs'
 
+const id = 'tools.ozone.moderation.queryStatuses'
+
 export interface QueryParams {
   /** All subjects, or subjects from given 'collections' param, belonging to the account specified in the 'subject' param will be returned. */
   includeAllUserRecords?: boolean
diff --git a/packages/api/src/client/types/tools/ozone/moderation/searchRepos.ts b/packages/api/src/client/types/tools/ozone/moderation/searchRepos.ts
index 060b2b96331..9205ee67939 100644
--- a/packages/api/src/client/types/tools/ozone/moderation/searchRepos.ts
+++ b/packages/api/src/client/types/tools/ozone/moderation/searchRepos.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneModerationDefs from './defs'
 
+const id = 'tools.ozone.moderation.searchRepos'
+
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead */
   term?: string
diff --git a/packages/api/src/client/types/tools/ozone/server/getConfig.ts b/packages/api/src/client/types/tools/ozone/server/getConfig.ts
index d0127531450..55d5eb324c9 100644
--- a/packages/api/src/client/types/tools/ozone/server/getConfig.ts
+++ b/packages/api/src/client/types/tools/ozone/server/getConfig.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'tools.ozone.server.getConfig'
 
 export interface QueryParams {}
 
@@ -40,16 +42,17 @@ export interface ServiceConfig {
   [k: string]: unknown
 }
 
-export function isServiceConfig(v: unknown): v is ServiceConfig {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.server.getConfig#serviceConfig'
-  )
+export function isServiceConfig(v: unknown): v is ServiceConfig & {
+  $type: $Type<'tools.ozone.server.getConfig', 'serviceConfig'>
+} {
+  return is$typed(v, id, 'serviceConfig')
 }
 
-export function validateServiceConfig(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.server.getConfig#serviceConfig', v)
+export function validateServiceConfig(v: unknown) {
+  return lexicons.validate(
+    `${id}#serviceConfig`,
+    v,
+  ) as ValidationResult<ServiceConfig>
 }
 
 export interface ViewerConfig {
@@ -61,14 +64,15 @@ export interface ViewerConfig {
   [k: string]: unknown
 }
 
-export function isViewerConfig(v: unknown): v is ViewerConfig {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.server.getConfig#viewerConfig'
-  )
+export function isViewerConfig(v: unknown): v is ViewerConfig & {
+  $type: $Type<'tools.ozone.server.getConfig', 'viewerConfig'>
+} {
+  return is$typed(v, id, 'viewerConfig')
 }
 
-export function validateViewerConfig(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.server.getConfig#viewerConfig', v)
+export function validateViewerConfig(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewerConfig`,
+    v,
+  ) as ValidationResult<ViewerConfig>
 }
diff --git a/packages/api/src/client/types/tools/ozone/set/addValues.ts b/packages/api/src/client/types/tools/ozone/set/addValues.ts
index 04379b2e5c3..b628282aeb9 100644
--- a/packages/api/src/client/types/tools/ozone/set/addValues.ts
+++ b/packages/api/src/client/types/tools/ozone/set/addValues.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'tools.ozone.set.addValues'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/tools/ozone/set/defs.ts b/packages/api/src/client/types/tools/ozone/set/defs.ts
index d6823eb9b84..b8449307784 100644
--- a/packages/api/src/client/types/tools/ozone/set/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/set/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'tools.ozone.set.defs'
 
 export interface Set {
   name: string
@@ -12,14 +14,14 @@ export interface Set {
   [k: string]: unknown
 }
 
-export function isSet(v: unknown): v is Set {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'tools.ozone.set.defs#set'
-  )
+export function isSet(
+  v: unknown,
+): v is Set & { $type: $Type<'tools.ozone.set.defs', 'set'> } {
+  return is$typed(v, id, 'set')
 }
 
-export function validateSet(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.set.defs#set', v)
+export function validateSet(v: unknown) {
+  return lexicons.validate(`${id}#set`, v) as ValidationResult<Set>
 }
 
 export interface SetView {
@@ -31,14 +33,12 @@ export interface SetView {
   [k: string]: unknown
 }
 
-export function isSetView(v: unknown): v is SetView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.set.defs#setView'
-  )
+export function isSetView(
+  v: unknown,
+): v is SetView & { $type: $Type<'tools.ozone.set.defs', 'setView'> } {
+  return is$typed(v, id, 'setView')
 }
 
-export function validateSetView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.set.defs#setView', v)
+export function validateSetView(v: unknown) {
+  return lexicons.validate(`${id}#setView`, v) as ValidationResult<SetView>
 }
diff --git a/packages/api/src/client/types/tools/ozone/set/deleteSet.ts b/packages/api/src/client/types/tools/ozone/set/deleteSet.ts
index 52988ca54c9..2722cfee543 100644
--- a/packages/api/src/client/types/tools/ozone/set/deleteSet.ts
+++ b/packages/api/src/client/types/tools/ozone/set/deleteSet.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'tools.ozone.set.deleteSet'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/tools/ozone/set/deleteValues.ts b/packages/api/src/client/types/tools/ozone/set/deleteValues.ts
index 71845188b04..901ab2b219a 100644
--- a/packages/api/src/client/types/tools/ozone/set/deleteValues.ts
+++ b/packages/api/src/client/types/tools/ozone/set/deleteValues.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'tools.ozone.set.deleteValues'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/tools/ozone/set/getValues.ts b/packages/api/src/client/types/tools/ozone/set/getValues.ts
index e8b848a5ef7..dca9c73fdd0 100644
--- a/packages/api/src/client/types/tools/ozone/set/getValues.ts
+++ b/packages/api/src/client/types/tools/ozone/set/getValues.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneSetDefs from './defs'
 
+const id = 'tools.ozone.set.getValues'
+
 export interface QueryParams {
   name: string
   limit?: number
diff --git a/packages/api/src/client/types/tools/ozone/set/querySets.ts b/packages/api/src/client/types/tools/ozone/set/querySets.ts
index dcb19d52890..723fa2e650b 100644
--- a/packages/api/src/client/types/tools/ozone/set/querySets.ts
+++ b/packages/api/src/client/types/tools/ozone/set/querySets.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneSetDefs from './defs'
 
+const id = 'tools.ozone.set.querySets'
+
 export interface QueryParams {
   limit?: number
   cursor?: string
diff --git a/packages/api/src/client/types/tools/ozone/set/upsertSet.ts b/packages/api/src/client/types/tools/ozone/set/upsertSet.ts
index 3489fe4cff1..024cd4b62bb 100644
--- a/packages/api/src/client/types/tools/ozone/set/upsertSet.ts
+++ b/packages/api/src/client/types/tools/ozone/set/upsertSet.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneSetDefs from './defs'
 
+const id = 'tools.ozone.set.upsertSet'
+
 export interface QueryParams {}
 
 export type InputSchema = ToolsOzoneSetDefs.Set
diff --git a/packages/api/src/client/types/tools/ozone/setting/defs.ts b/packages/api/src/client/types/tools/ozone/setting/defs.ts
index 0193b78b811..192915fe56d 100644
--- a/packages/api/src/client/types/tools/ozone/setting/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/setting/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'tools.ozone.setting.defs'
 
 export interface Option {
   key: string
@@ -24,14 +26,12 @@ export interface Option {
   [k: string]: unknown
 }
 
-export function isOption(v: unknown): v is Option {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.setting.defs#option'
-  )
+export function isOption(
+  v: unknown,
+): v is Option & { $type: $Type<'tools.ozone.setting.defs', 'option'> } {
+  return is$typed(v, id, 'option')
 }
 
-export function validateOption(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.setting.defs#option', v)
+export function validateOption(v: unknown) {
+  return lexicons.validate(`${id}#option`, v) as ValidationResult<Option>
 }
diff --git a/packages/api/src/client/types/tools/ozone/setting/listOptions.ts b/packages/api/src/client/types/tools/ozone/setting/listOptions.ts
index d4a91230440..6b12b210cf3 100644
--- a/packages/api/src/client/types/tools/ozone/setting/listOptions.ts
+++ b/packages/api/src/client/types/tools/ozone/setting/listOptions.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneSettingDefs from './defs'
 
+const id = 'tools.ozone.setting.listOptions'
+
 export interface QueryParams {
   limit?: number
   cursor?: string
diff --git a/packages/api/src/client/types/tools/ozone/setting/removeOptions.ts b/packages/api/src/client/types/tools/ozone/setting/removeOptions.ts
index 2073a3e298a..7a351b52be9 100644
--- a/packages/api/src/client/types/tools/ozone/setting/removeOptions.ts
+++ b/packages/api/src/client/types/tools/ozone/setting/removeOptions.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'tools.ozone.setting.removeOptions'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/tools/ozone/setting/upsertOption.ts b/packages/api/src/client/types/tools/ozone/setting/upsertOption.ts
index b37e2d790b5..1b25cc316be 100644
--- a/packages/api/src/client/types/tools/ozone/setting/upsertOption.ts
+++ b/packages/api/src/client/types/tools/ozone/setting/upsertOption.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneSettingDefs from './defs'
 
+const id = 'tools.ozone.setting.upsertOption'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/api/src/client/types/tools/ozone/signature/defs.ts b/packages/api/src/client/types/tools/ozone/signature/defs.ts
index 1ab8f12a45b..5e0575d36bd 100644
--- a/packages/api/src/client/types/tools/ozone/signature/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/signature/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'tools.ozone.signature.defs'
 
 export interface SigDetail {
   property: string
@@ -12,14 +14,12 @@ export interface SigDetail {
   [k: string]: unknown
 }
 
-export function isSigDetail(v: unknown): v is SigDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.signature.defs#sigDetail'
-  )
+export function isSigDetail(v: unknown): v is SigDetail & {
+  $type: $Type<'tools.ozone.signature.defs', 'sigDetail'>
+} {
+  return is$typed(v, id, 'sigDetail')
 }
 
-export function validateSigDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.signature.defs#sigDetail', v)
+export function validateSigDetail(v: unknown) {
+  return lexicons.validate(`${id}#sigDetail`, v) as ValidationResult<SigDetail>
 }
diff --git a/packages/api/src/client/types/tools/ozone/signature/findCorrelation.ts b/packages/api/src/client/types/tools/ozone/signature/findCorrelation.ts
index f04a5c735d2..079b7ee2e86 100644
--- a/packages/api/src/client/types/tools/ozone/signature/findCorrelation.ts
+++ b/packages/api/src/client/types/tools/ozone/signature/findCorrelation.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneSignatureDefs from './defs'
 
+const id = 'tools.ozone.signature.findCorrelation'
+
 export interface QueryParams {
   dids: string[]
 }
diff --git a/packages/api/src/client/types/tools/ozone/signature/findRelatedAccounts.ts b/packages/api/src/client/types/tools/ozone/signature/findRelatedAccounts.ts
index b817bbef60e..61021d863c1 100644
--- a/packages/api/src/client/types/tools/ozone/signature/findRelatedAccounts.ts
+++ b/packages/api/src/client/types/tools/ozone/signature/findRelatedAccounts.ts
@@ -3,12 +3,14 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
 import * as ToolsOzoneSignatureDefs from './defs'
 
+const id = 'tools.ozone.signature.findRelatedAccounts'
+
 export interface QueryParams {
   did: string
   cursor?: string
@@ -44,17 +46,15 @@ export interface RelatedAccount {
   [k: string]: unknown
 }
 
-export function isRelatedAccount(v: unknown): v is RelatedAccount {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.signature.findRelatedAccounts#relatedAccount'
-  )
+export function isRelatedAccount(v: unknown): v is RelatedAccount & {
+  $type: $Type<'tools.ozone.signature.findRelatedAccounts', 'relatedAccount'>
+} {
+  return is$typed(v, id, 'relatedAccount')
 }
 
-export function validateRelatedAccount(v: unknown): ValidationResult {
+export function validateRelatedAccount(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.signature.findRelatedAccounts#relatedAccount',
+    `${id}#relatedAccount`,
     v,
-  )
+  ) as ValidationResult<RelatedAccount>
 }
diff --git a/packages/api/src/client/types/tools/ozone/signature/searchAccounts.ts b/packages/api/src/client/types/tools/ozone/signature/searchAccounts.ts
index 70e37b77458..6e7dd5231c3 100644
--- a/packages/api/src/client/types/tools/ozone/signature/searchAccounts.ts
+++ b/packages/api/src/client/types/tools/ozone/signature/searchAccounts.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
 
+const id = 'tools.ozone.signature.searchAccounts'
+
 export interface QueryParams {
   values: string[]
   cursor?: string
diff --git a/packages/api/src/client/types/tools/ozone/team/addMember.ts b/packages/api/src/client/types/tools/ozone/team/addMember.ts
index c323687ff0a..86ab1a33e5d 100644
--- a/packages/api/src/client/types/tools/ozone/team/addMember.ts
+++ b/packages/api/src/client/types/tools/ozone/team/addMember.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneTeamDefs from './defs'
 
+const id = 'tools.ozone.team.addMember'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/api/src/client/types/tools/ozone/team/defs.ts b/packages/api/src/client/types/tools/ozone/team/defs.ts
index 78fb7989264..77f7692fca2 100644
--- a/packages/api/src/client/types/tools/ozone/team/defs.ts
+++ b/packages/api/src/client/types/tools/ozone/team/defs.ts
@@ -2,11 +2,13 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
 
+const id = 'tools.ozone.team.defs'
+
 export interface Member {
   did: string
   disabled?: boolean
@@ -22,21 +24,19 @@ export interface Member {
   [k: string]: unknown
 }
 
-export function isMember(v: unknown): v is Member {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.team.defs#member'
-  )
+export function isMember(
+  v: unknown,
+): v is Member & { $type: $Type<'tools.ozone.team.defs', 'member'> } {
+  return is$typed(v, id, 'member')
 }
 
-export function validateMember(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.team.defs#member', v)
+export function validateMember(v: unknown) {
+  return lexicons.validate(`${id}#member`, v) as ValidationResult<Member>
 }
 
 /** Admin role. Highest level of access, can perform all actions. */
-export const ROLEADMIN = 'tools.ozone.team.defs#roleAdmin'
+export const ROLEADMIN = `${id}#roleAdmin`
 /** Moderator role. Can perform most actions. */
-export const ROLEMODERATOR = 'tools.ozone.team.defs#roleModerator'
+export const ROLEMODERATOR = `${id}#roleModerator`
 /** Triage role. Mostly intended for monitoring and escalating issues. */
-export const ROLETRIAGE = 'tools.ozone.team.defs#roleTriage'
+export const ROLETRIAGE = `${id}#roleTriage`
diff --git a/packages/api/src/client/types/tools/ozone/team/deleteMember.ts b/packages/api/src/client/types/tools/ozone/team/deleteMember.ts
index b456035e5d8..f8440f294e4 100644
--- a/packages/api/src/client/types/tools/ozone/team/deleteMember.ts
+++ b/packages/api/src/client/types/tools/ozone/team/deleteMember.ts
@@ -3,9 +3,11 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+
+const id = 'tools.ozone.team.deleteMember'
 
 export interface QueryParams {}
 
diff --git a/packages/api/src/client/types/tools/ozone/team/listMembers.ts b/packages/api/src/client/types/tools/ozone/team/listMembers.ts
index a0275d0e838..3b3a7e94c30 100644
--- a/packages/api/src/client/types/tools/ozone/team/listMembers.ts
+++ b/packages/api/src/client/types/tools/ozone/team/listMembers.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneTeamDefs from './defs'
 
+const id = 'tools.ozone.team.listMembers'
+
 export interface QueryParams {
   limit?: number
   cursor?: string
diff --git a/packages/api/src/client/types/tools/ozone/team/updateMember.ts b/packages/api/src/client/types/tools/ozone/team/updateMember.ts
index 71a96d12fa2..43ce530e696 100644
--- a/packages/api/src/client/types/tools/ozone/team/updateMember.ts
+++ b/packages/api/src/client/types/tools/ozone/team/updateMember.ts
@@ -3,11 +3,13 @@
  */
 import { HeadersMap, XRPCError } from '@atproto/xrpc'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { isObj, hasProp } from '../../../../util'
-import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
+import { $Type, is$typed } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
 import * as ToolsOzoneTeamDefs from './defs'
 
+const id = 'tools.ozone.team.updateMember'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/api/src/client/util.ts b/packages/api/src/client/util.ts
index d7e70440d6e..a8b8cc9e0b7 100644
--- a/packages/api/src/client/util.ts
+++ b/packages/api/src/client/util.ts
@@ -1,13 +1,39 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-export function isObj(v: unknown): v is Record<string, unknown> {
-  return typeof v === 'object' && v !== null
+export type $Typed<V> = V & { $type: string }
+
+export type $Type<Id extends string, Hash extends string> = Hash extends 'main'
+  ? Id | `${Id}#${Hash}`
+  : `${Id}#${Hash}`
+
+function has$type<V>(v: V): v is $Typed<V & object> {
+  return (
+    v != null &&
+    typeof v === 'object' &&
+    '$type' in v &&
+    typeof v.$type === 'string'
+  )
+}
+
+function check$type<Id extends string, Hash extends string>(
+  $type: string,
+  id: Id,
+  hash: Hash,
+): $type is $Type<Id, Hash> {
+  return $type === id
+    ? hash === 'main'
+    : // $type === `${id}#${hash}`
+      $type.length === id.length + 1 + hash.length &&
+        $type.charCodeAt(id.length) === 35 /* '#' */ &&
+        $type.startsWith(id) &&
+        $type.endsWith(hash)
 }
 
-export function hasProp<K extends PropertyKey>(
-  data: object,
-  prop: K,
-): data is Record<K, unknown> {
-  return prop in data
+export function is$typed<V, Id extends string, Hash extends string>(
+  v: V,
+  id: Id,
+  hash: Hash,
+): v is V & object & { $type: $Type<Id, Hash> } {
+  return has$type(v) && check$type(v.$type, id, hash)
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/defs.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/defs.ts
index d1ad4f980c2..8f8e17ba184 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/defs.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as AppBskyGraphDefs from '../graph/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const id = 'app.bsky.actor.defs'
+
 export interface ProfileViewBasic {
   did: string
   handle: string
@@ -21,16 +23,17 @@ export interface ProfileViewBasic {
   [k: string]: unknown
 }
 
-export function isProfileViewBasic(v: unknown): v is ProfileViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileViewBasic'
-  )
+export function isProfileViewBasic(v: unknown): v is ProfileViewBasic & {
+  $type: $Type<'app.bsky.actor.defs', 'profileViewBasic'>
+} {
+  return is$typed(v, id, 'profileViewBasic')
 }
 
-export function validateProfileViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileViewBasic', v)
+export function validateProfileViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileViewBasic`,
+    v,
+  ) as ValidationResult<ProfileViewBasic>
 }
 
 export interface ProfileView {
@@ -47,16 +50,17 @@ export interface ProfileView {
   [k: string]: unknown
 }
 
-export function isProfileView(v: unknown): v is ProfileView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileView'
-  )
+export function isProfileView(
+  v: unknown,
+): v is ProfileView & { $type: $Type<'app.bsky.actor.defs', 'profileView'> } {
+  return is$typed(v, id, 'profileView')
 }
 
-export function validateProfileView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileView', v)
+export function validateProfileView(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileView`,
+    v,
+  ) as ValidationResult<ProfileView>
 }
 
 export interface ProfileViewDetailed {
@@ -79,16 +83,17 @@ export interface ProfileViewDetailed {
   [k: string]: unknown
 }
 
-export function isProfileViewDetailed(v: unknown): v is ProfileViewDetailed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileViewDetailed'
-  )
+export function isProfileViewDetailed(v: unknown): v is ProfileViewDetailed & {
+  $type: $Type<'app.bsky.actor.defs', 'profileViewDetailed'>
+} {
+  return is$typed(v, id, 'profileViewDetailed')
 }
 
-export function validateProfileViewDetailed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileViewDetailed', v)
+export function validateProfileViewDetailed(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileViewDetailed`,
+    v,
+  ) as ValidationResult<ProfileViewDetailed>
 }
 
 export interface ProfileAssociated {
@@ -100,16 +105,17 @@ export interface ProfileAssociated {
   [k: string]: unknown
 }
 
-export function isProfileAssociated(v: unknown): v is ProfileAssociated {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileAssociated'
-  )
+export function isProfileAssociated(v: unknown): v is ProfileAssociated & {
+  $type: $Type<'app.bsky.actor.defs', 'profileAssociated'>
+} {
+  return is$typed(v, id, 'profileAssociated')
 }
 
-export function validateProfileAssociated(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileAssociated', v)
+export function validateProfileAssociated(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileAssociated`,
+    v,
+  ) as ValidationResult<ProfileAssociated>
 }
 
 export interface ProfileAssociatedChat {
@@ -119,16 +125,17 @@ export interface ProfileAssociatedChat {
 
 export function isProfileAssociatedChat(
   v: unknown,
-): v is ProfileAssociatedChat {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileAssociatedChat'
-  )
+): v is ProfileAssociatedChat & {
+  $type: $Type<'app.bsky.actor.defs', 'profileAssociatedChat'>
+} {
+  return is$typed(v, id, 'profileAssociatedChat')
 }
 
-export function validateProfileAssociatedChat(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileAssociatedChat', v)
+export function validateProfileAssociatedChat(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileAssociatedChat`,
+    v,
+  ) as ValidationResult<ProfileAssociatedChat>
 }
 
 /** Metadata about the requesting account's relationship with the subject account. Only has meaningful content for authed requests. */
@@ -144,16 +151,17 @@ export interface ViewerState {
   [k: string]: unknown
 }
 
-export function isViewerState(v: unknown): v is ViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#viewerState'
-  )
+export function isViewerState(
+  v: unknown,
+): v is ViewerState & { $type: $Type<'app.bsky.actor.defs', 'viewerState'> } {
+  return is$typed(v, id, 'viewerState')
 }
 
-export function validateViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#viewerState', v)
+export function validateViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewerState`,
+    v,
+  ) as ValidationResult<ViewerState>
 }
 
 /** The subject's followers whom you also follow */
@@ -163,16 +171,17 @@ export interface KnownFollowers {
   [k: string]: unknown
 }
 
-export function isKnownFollowers(v: unknown): v is KnownFollowers {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#knownFollowers'
-  )
+export function isKnownFollowers(v: unknown): v is KnownFollowers & {
+  $type: $Type<'app.bsky.actor.defs', 'knownFollowers'>
+} {
+  return is$typed(v, id, 'knownFollowers')
 }
 
-export function validateKnownFollowers(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#knownFollowers', v)
+export function validateKnownFollowers(v: unknown) {
+  return lexicons.validate(
+    `${id}#knownFollowers`,
+    v,
+  ) as ValidationResult<KnownFollowers>
 }
 
 export type Preferences = (
@@ -196,16 +205,17 @@ export interface AdultContentPref {
   [k: string]: unknown
 }
 
-export function isAdultContentPref(v: unknown): v is AdultContentPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#adultContentPref'
-  )
+export function isAdultContentPref(v: unknown): v is AdultContentPref & {
+  $type: $Type<'app.bsky.actor.defs', 'adultContentPref'>
+} {
+  return is$typed(v, id, 'adultContentPref')
 }
 
-export function validateAdultContentPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#adultContentPref', v)
+export function validateAdultContentPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#adultContentPref`,
+    v,
+  ) as ValidationResult<AdultContentPref>
 }
 
 export interface ContentLabelPref {
@@ -216,16 +226,17 @@ export interface ContentLabelPref {
   [k: string]: unknown
 }
 
-export function isContentLabelPref(v: unknown): v is ContentLabelPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#contentLabelPref'
-  )
+export function isContentLabelPref(v: unknown): v is ContentLabelPref & {
+  $type: $Type<'app.bsky.actor.defs', 'contentLabelPref'>
+} {
+  return is$typed(v, id, 'contentLabelPref')
 }
 
-export function validateContentLabelPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#contentLabelPref', v)
+export function validateContentLabelPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#contentLabelPref`,
+    v,
+  ) as ValidationResult<ContentLabelPref>
 }
 
 export interface SavedFeed {
@@ -236,16 +247,14 @@ export interface SavedFeed {
   [k: string]: unknown
 }
 
-export function isSavedFeed(v: unknown): v is SavedFeed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeed'
-  )
+export function isSavedFeed(
+  v: unknown,
+): v is SavedFeed & { $type: $Type<'app.bsky.actor.defs', 'savedFeed'> } {
+  return is$typed(v, id, 'savedFeed')
 }
 
-export function validateSavedFeed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeed', v)
+export function validateSavedFeed(v: unknown) {
+  return lexicons.validate(`${id}#savedFeed`, v) as ValidationResult<SavedFeed>
 }
 
 export interface SavedFeedsPrefV2 {
@@ -253,16 +262,17 @@ export interface SavedFeedsPrefV2 {
   [k: string]: unknown
 }
 
-export function isSavedFeedsPrefV2(v: unknown): v is SavedFeedsPrefV2 {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeedsPrefV2'
-  )
+export function isSavedFeedsPrefV2(v: unknown): v is SavedFeedsPrefV2 & {
+  $type: $Type<'app.bsky.actor.defs', 'savedFeedsPrefV2'>
+} {
+  return is$typed(v, id, 'savedFeedsPrefV2')
 }
 
-export function validateSavedFeedsPrefV2(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeedsPrefV2', v)
+export function validateSavedFeedsPrefV2(v: unknown) {
+  return lexicons.validate(
+    `${id}#savedFeedsPrefV2`,
+    v,
+  ) as ValidationResult<SavedFeedsPrefV2>
 }
 
 export interface SavedFeedsPref {
@@ -272,16 +282,17 @@ export interface SavedFeedsPref {
   [k: string]: unknown
 }
 
-export function isSavedFeedsPref(v: unknown): v is SavedFeedsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeedsPref'
-  )
+export function isSavedFeedsPref(v: unknown): v is SavedFeedsPref & {
+  $type: $Type<'app.bsky.actor.defs', 'savedFeedsPref'>
+} {
+  return is$typed(v, id, 'savedFeedsPref')
 }
 
-export function validateSavedFeedsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeedsPref', v)
+export function validateSavedFeedsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#savedFeedsPref`,
+    v,
+  ) as ValidationResult<SavedFeedsPref>
 }
 
 export interface PersonalDetailsPref {
@@ -290,16 +301,17 @@ export interface PersonalDetailsPref {
   [k: string]: unknown
 }
 
-export function isPersonalDetailsPref(v: unknown): v is PersonalDetailsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#personalDetailsPref'
-  )
+export function isPersonalDetailsPref(v: unknown): v is PersonalDetailsPref & {
+  $type: $Type<'app.bsky.actor.defs', 'personalDetailsPref'>
+} {
+  return is$typed(v, id, 'personalDetailsPref')
 }
 
-export function validatePersonalDetailsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#personalDetailsPref', v)
+export function validatePersonalDetailsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#personalDetailsPref`,
+    v,
+  ) as ValidationResult<PersonalDetailsPref>
 }
 
 export interface FeedViewPref {
@@ -318,16 +330,17 @@ export interface FeedViewPref {
   [k: string]: unknown
 }
 
-export function isFeedViewPref(v: unknown): v is FeedViewPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#feedViewPref'
-  )
+export function isFeedViewPref(
+  v: unknown,
+): v is FeedViewPref & { $type: $Type<'app.bsky.actor.defs', 'feedViewPref'> } {
+  return is$typed(v, id, 'feedViewPref')
 }
 
-export function validateFeedViewPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#feedViewPref', v)
+export function validateFeedViewPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#feedViewPref`,
+    v,
+  ) as ValidationResult<FeedViewPref>
 }
 
 export interface ThreadViewPref {
@@ -344,16 +357,17 @@ export interface ThreadViewPref {
   [k: string]: unknown
 }
 
-export function isThreadViewPref(v: unknown): v is ThreadViewPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#threadViewPref'
-  )
+export function isThreadViewPref(v: unknown): v is ThreadViewPref & {
+  $type: $Type<'app.bsky.actor.defs', 'threadViewPref'>
+} {
+  return is$typed(v, id, 'threadViewPref')
 }
 
-export function validateThreadViewPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#threadViewPref', v)
+export function validateThreadViewPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#threadViewPref`,
+    v,
+  ) as ValidationResult<ThreadViewPref>
 }
 
 export interface InterestsPref {
@@ -362,16 +376,17 @@ export interface InterestsPref {
   [k: string]: unknown
 }
 
-export function isInterestsPref(v: unknown): v is InterestsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#interestsPref'
-  )
+export function isInterestsPref(v: unknown): v is InterestsPref & {
+  $type: $Type<'app.bsky.actor.defs', 'interestsPref'>
+} {
+  return is$typed(v, id, 'interestsPref')
 }
 
-export function validateInterestsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#interestsPref', v)
+export function validateInterestsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#interestsPref`,
+    v,
+  ) as ValidationResult<InterestsPref>
 }
 
 export type MutedWordTarget = 'content' | 'tag' | (string & {})
@@ -390,16 +405,14 @@ export interface MutedWord {
   [k: string]: unknown
 }
 
-export function isMutedWord(v: unknown): v is MutedWord {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#mutedWord'
-  )
+export function isMutedWord(
+  v: unknown,
+): v is MutedWord & { $type: $Type<'app.bsky.actor.defs', 'mutedWord'> } {
+  return is$typed(v, id, 'mutedWord')
 }
 
-export function validateMutedWord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#mutedWord', v)
+export function validateMutedWord(v: unknown) {
+  return lexicons.validate(`${id}#mutedWord`, v) as ValidationResult<MutedWord>
 }
 
 export interface MutedWordsPref {
@@ -408,16 +421,17 @@ export interface MutedWordsPref {
   [k: string]: unknown
 }
 
-export function isMutedWordsPref(v: unknown): v is MutedWordsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#mutedWordsPref'
-  )
+export function isMutedWordsPref(v: unknown): v is MutedWordsPref & {
+  $type: $Type<'app.bsky.actor.defs', 'mutedWordsPref'>
+} {
+  return is$typed(v, id, 'mutedWordsPref')
 }
 
-export function validateMutedWordsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#mutedWordsPref', v)
+export function validateMutedWordsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#mutedWordsPref`,
+    v,
+  ) as ValidationResult<MutedWordsPref>
 }
 
 export interface HiddenPostsPref {
@@ -426,16 +440,17 @@ export interface HiddenPostsPref {
   [k: string]: unknown
 }
 
-export function isHiddenPostsPref(v: unknown): v is HiddenPostsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#hiddenPostsPref'
-  )
+export function isHiddenPostsPref(v: unknown): v is HiddenPostsPref & {
+  $type: $Type<'app.bsky.actor.defs', 'hiddenPostsPref'>
+} {
+  return is$typed(v, id, 'hiddenPostsPref')
 }
 
-export function validateHiddenPostsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#hiddenPostsPref', v)
+export function validateHiddenPostsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#hiddenPostsPref`,
+    v,
+  ) as ValidationResult<HiddenPostsPref>
 }
 
 export interface LabelersPref {
@@ -443,16 +458,17 @@ export interface LabelersPref {
   [k: string]: unknown
 }
 
-export function isLabelersPref(v: unknown): v is LabelersPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#labelersPref'
-  )
+export function isLabelersPref(
+  v: unknown,
+): v is LabelersPref & { $type: $Type<'app.bsky.actor.defs', 'labelersPref'> } {
+  return is$typed(v, id, 'labelersPref')
 }
 
-export function validateLabelersPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#labelersPref', v)
+export function validateLabelersPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelersPref`,
+    v,
+  ) as ValidationResult<LabelersPref>
 }
 
 export interface LabelerPrefItem {
@@ -460,16 +476,17 @@ export interface LabelerPrefItem {
   [k: string]: unknown
 }
 
-export function isLabelerPrefItem(v: unknown): v is LabelerPrefItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#labelerPrefItem'
-  )
+export function isLabelerPrefItem(v: unknown): v is LabelerPrefItem & {
+  $type: $Type<'app.bsky.actor.defs', 'labelerPrefItem'>
+} {
+  return is$typed(v, id, 'labelerPrefItem')
 }
 
-export function validateLabelerPrefItem(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#labelerPrefItem', v)
+export function validateLabelerPrefItem(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerPrefItem`,
+    v,
+  ) as ValidationResult<LabelerPrefItem>
 }
 
 /** A grab bag of state that's specific to the bsky.app program. Third-party apps shouldn't use this. */
@@ -482,16 +499,17 @@ export interface BskyAppStatePref {
   [k: string]: unknown
 }
 
-export function isBskyAppStatePref(v: unknown): v is BskyAppStatePref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#bskyAppStatePref'
-  )
+export function isBskyAppStatePref(v: unknown): v is BskyAppStatePref & {
+  $type: $Type<'app.bsky.actor.defs', 'bskyAppStatePref'>
+} {
+  return is$typed(v, id, 'bskyAppStatePref')
 }
 
-export function validateBskyAppStatePref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#bskyAppStatePref', v)
+export function validateBskyAppStatePref(v: unknown) {
+  return lexicons.validate(
+    `${id}#bskyAppStatePref`,
+    v,
+  ) as ValidationResult<BskyAppStatePref>
 }
 
 /** If set, an active progress guide. Once completed, can be set to undefined. Should have unspecced fields tracking progress. */
@@ -500,16 +518,19 @@ export interface BskyAppProgressGuide {
   [k: string]: unknown
 }
 
-export function isBskyAppProgressGuide(v: unknown): v is BskyAppProgressGuide {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#bskyAppProgressGuide'
-  )
+export function isBskyAppProgressGuide(
+  v: unknown,
+): v is BskyAppProgressGuide & {
+  $type: $Type<'app.bsky.actor.defs', 'bskyAppProgressGuide'>
+} {
+  return is$typed(v, id, 'bskyAppProgressGuide')
 }
 
-export function validateBskyAppProgressGuide(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#bskyAppProgressGuide', v)
+export function validateBskyAppProgressGuide(v: unknown) {
+  return lexicons.validate(
+    `${id}#bskyAppProgressGuide`,
+    v,
+  ) as ValidationResult<BskyAppProgressGuide>
 }
 
 /** A new user experiences (NUX) storage object */
@@ -523,12 +544,12 @@ export interface Nux {
   [k: string]: unknown
 }
 
-export function isNux(v: unknown): v is Nux {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.actor.defs#nux'
-  )
+export function isNux(
+  v: unknown,
+): v is Nux & { $type: $Type<'app.bsky.actor.defs', 'nux'> } {
+  return is$typed(v, id, 'nux')
 }
 
-export function validateNux(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#nux', v)
+export function validateNux(v: unknown) {
+  return lexicons.validate(`${id}#nux`, v) as ValidationResult<Nux>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/getPreferences.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/getPreferences.ts
index 305e80484be..680cdd0967d 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/getPreferences.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/getPreferences.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+const id = 'app.bsky.actor.getPreferences'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/getProfile.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/getProfile.ts
index 5a7b1f25bfc..2ce818e78d1 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/getProfile.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/getProfile.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+const id = 'app.bsky.actor.getProfile'
+
 export interface QueryParams {
   /** Handle or DID of account to fetch profile of. */
   actor: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/getProfiles.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/getProfiles.ts
index 16438505654..354d8677cc1 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/getProfiles.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/getProfiles.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+const id = 'app.bsky.actor.getProfiles'
+
 export interface QueryParams {
   actors: string[]
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/getSuggestions.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/getSuggestions.ts
index 33b89a18bfa..1690000cb13 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/getSuggestions.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/getSuggestions.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+const id = 'app.bsky.actor.getSuggestions'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/profile.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/profile.ts
index 617bdf2cd73..9c71f43c191 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/profile.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/profile.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const id = 'app.bsky.actor.profile'
+
 export interface Record {
   displayName?: string
   /** Free-form profile description text. */
@@ -25,15 +27,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.actor.profile#main' ||
-      v.$type === 'app.bsky.actor.profile')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.actor.profile', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.profile#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/putPreferences.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/putPreferences.ts
index 670e752fea3..ecedca7927f 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/putPreferences.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/putPreferences.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+const id = 'app.bsky.actor.putPreferences'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/searchActors.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/searchActors.ts
index dcda0c41854..5b788366ee5 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/searchActors.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/searchActors.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+const id = 'app.bsky.actor.searchActors'
+
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead. */
   term?: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
index 0198b23d790..754e2e8db17 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+const id = 'app.bsky.actor.searchActorsTypeahead'
+
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead. */
   term?: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/embed/defs.ts b/packages/bsky/src/lexicon/types/app/bsky/embed/defs.ts
index cc253f9e610..299c6f4e414 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/embed/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/embed/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.embed.defs'
 
 /** width:height represents an aspect ratio. It may be approximate, and may not correspond to absolute dimensions in any given unit. */
 export interface AspectRatio {
@@ -13,14 +15,15 @@ export interface AspectRatio {
   [k: string]: unknown
 }
 
-export function isAspectRatio(v: unknown): v is AspectRatio {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.defs#aspectRatio'
-  )
+export function isAspectRatio(
+  v: unknown,
+): v is AspectRatio & { $type: $Type<'app.bsky.embed.defs', 'aspectRatio'> } {
+  return is$typed(v, id, 'aspectRatio')
 }
 
-export function validateAspectRatio(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.defs#aspectRatio', v)
+export function validateAspectRatio(v: unknown) {
+  return lexicons.validate(
+    `${id}#aspectRatio`,
+    v,
+  ) as ValidationResult<AspectRatio>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/embed/external.ts b/packages/bsky/src/lexicon/types/app/bsky/embed/external.ts
index b137ee4b6f5..205bc5280c9 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/embed/external.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/embed/external.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.embed.external'
 
 /** A representation of some externally linked content (eg, a URL and 'card'), embedded in a Bluesky record (eg, a post). */
 export interface Main {
@@ -12,17 +14,14 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.external#main' ||
-      v.$type === 'app.bsky.embed.external')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: $Type<'app.bsky.embed.external', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface External {
@@ -33,16 +32,14 @@ export interface External {
   [k: string]: unknown
 }
 
-export function isExternal(v: unknown): v is External {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#external'
-  )
+export function isExternal(
+  v: unknown,
+): v is External & { $type: $Type<'app.bsky.embed.external', 'external'> } {
+  return is$typed(v, id, 'external')
 }
 
-export function validateExternal(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#external', v)
+export function validateExternal(v: unknown) {
+  return lexicons.validate(`${id}#external`, v) as ValidationResult<External>
 }
 
 export interface View {
@@ -50,16 +47,14 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: $Type<'app.bsky.embed.external', 'view'> } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
 
 export interface ViewExternal {
@@ -70,14 +65,15 @@ export interface ViewExternal {
   [k: string]: unknown
 }
 
-export function isViewExternal(v: unknown): v is ViewExternal {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#viewExternal'
-  )
+export function isViewExternal(v: unknown): v is ViewExternal & {
+  $type: $Type<'app.bsky.embed.external', 'viewExternal'>
+} {
+  return is$typed(v, id, 'viewExternal')
 }
 
-export function validateViewExternal(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#viewExternal', v)
+export function validateViewExternal(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewExternal`,
+    v,
+  ) as ValidationResult<ViewExternal>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/embed/images.ts b/packages/bsky/src/lexicon/types/app/bsky/embed/images.ts
index 1fddf42f8eb..0fd622ba6c2 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/embed/images.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/embed/images.ts
@@ -2,27 +2,26 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyEmbedDefs from './defs'
 
+const id = 'app.bsky.embed.images'
+
 export interface Main {
   images: Image[]
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.images#main' ||
-      v.$type === 'app.bsky.embed.images')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: $Type<'app.bsky.embed.images', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface Image {
@@ -33,14 +32,14 @@ export interface Image {
   [k: string]: unknown
 }
 
-export function isImage(v: unknown): v is Image {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.images#image'
-  )
+export function isImage(
+  v: unknown,
+): v is Image & { $type: $Type<'app.bsky.embed.images', 'image'> } {
+  return is$typed(v, id, 'image')
 }
 
-export function validateImage(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#image', v)
+export function validateImage(v: unknown) {
+  return lexicons.validate(`${id}#image`, v) as ValidationResult<Image>
 }
 
 export interface View {
@@ -48,14 +47,14 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.images#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: $Type<'app.bsky.embed.images', 'view'> } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
 
 export interface ViewImage {
@@ -69,14 +68,12 @@ export interface ViewImage {
   [k: string]: unknown
 }
 
-export function isViewImage(v: unknown): v is ViewImage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.images#viewImage'
-  )
+export function isViewImage(
+  v: unknown,
+): v is ViewImage & { $type: $Type<'app.bsky.embed.images', 'viewImage'> } {
+  return is$typed(v, id, 'viewImage')
 }
 
-export function validateViewImage(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#viewImage', v)
+export function validateViewImage(v: unknown) {
+  return lexicons.validate(`${id}#viewImage`, v) as ValidationResult<ViewImage>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/embed/record.ts b/packages/bsky/src/lexicon/types/app/bsky/embed/record.ts
index 452c8fb7f71..d296b291fb8 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/embed/record.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/embed/record.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 import * as AppBskyFeedDefs from '../feed/defs'
 import * as AppBskyGraphDefs from '../graph/defs'
@@ -16,22 +16,21 @@ import * as AppBskyEmbedVideo from './video'
 import * as AppBskyEmbedExternal from './external'
 import * as AppBskyEmbedRecordWithMedia from './recordWithMedia'
 
+const id = 'app.bsky.embed.record'
+
 export interface Main {
   record: ComAtprotoRepoStrongRef.Main
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.record#main' ||
-      v.$type === 'app.bsky.embed.record')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: $Type<'app.bsky.embed.record', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface View {
@@ -48,14 +47,14 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.record#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: $Type<'app.bsky.embed.record', 'view'> } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
 
 export interface ViewRecord {
@@ -81,16 +80,17 @@ export interface ViewRecord {
   [k: string]: unknown
 }
 
-export function isViewRecord(v: unknown): v is ViewRecord {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewRecord'
-  )
+export function isViewRecord(
+  v: unknown,
+): v is ViewRecord & { $type: $Type<'app.bsky.embed.record', 'viewRecord'> } {
+  return is$typed(v, id, 'viewRecord')
 }
 
-export function validateViewRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewRecord', v)
+export function validateViewRecord(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewRecord`,
+    v,
+  ) as ValidationResult<ViewRecord>
 }
 
 export interface ViewNotFound {
@@ -99,16 +99,17 @@ export interface ViewNotFound {
   [k: string]: unknown
 }
 
-export function isViewNotFound(v: unknown): v is ViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewNotFound'
-  )
+export function isViewNotFound(v: unknown): v is ViewNotFound & {
+  $type: $Type<'app.bsky.embed.record', 'viewNotFound'>
+} {
+  return is$typed(v, id, 'viewNotFound')
 }
 
-export function validateViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewNotFound', v)
+export function validateViewNotFound(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewNotFound`,
+    v,
+  ) as ValidationResult<ViewNotFound>
 }
 
 export interface ViewBlocked {
@@ -118,16 +119,17 @@ export interface ViewBlocked {
   [k: string]: unknown
 }
 
-export function isViewBlocked(v: unknown): v is ViewBlocked {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewBlocked'
-  )
+export function isViewBlocked(
+  v: unknown,
+): v is ViewBlocked & { $type: $Type<'app.bsky.embed.record', 'viewBlocked'> } {
+  return is$typed(v, id, 'viewBlocked')
 }
 
-export function validateViewBlocked(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewBlocked', v)
+export function validateViewBlocked(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewBlocked`,
+    v,
+  ) as ValidationResult<ViewBlocked>
 }
 
 export interface ViewDetached {
@@ -136,14 +138,15 @@ export interface ViewDetached {
   [k: string]: unknown
 }
 
-export function isViewDetached(v: unknown): v is ViewDetached {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewDetached'
-  )
+export function isViewDetached(v: unknown): v is ViewDetached & {
+  $type: $Type<'app.bsky.embed.record', 'viewDetached'>
+} {
+  return is$typed(v, id, 'viewDetached')
 }
 
-export function validateViewDetached(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewDetached', v)
+export function validateViewDetached(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewDetached`,
+    v,
+  ) as ValidationResult<ViewDetached>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/embed/recordWithMedia.ts b/packages/bsky/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
index 4df0ee5c2d7..9af46777257 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
@@ -2,14 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyEmbedRecord from './record'
 import * as AppBskyEmbedImages from './images'
 import * as AppBskyEmbedVideo from './video'
 import * as AppBskyEmbedExternal from './external'
 
+const id = 'app.bsky.embed.recordWithMedia'
+
 export interface Main {
   record: AppBskyEmbedRecord.Main
   media:
@@ -20,17 +22,14 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.recordWithMedia#main' ||
-      v.$type === 'app.bsky.embed.recordWithMedia')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: $Type<'app.bsky.embed.recordWithMedia', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.recordWithMedia#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface View {
@@ -43,14 +42,12 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.recordWithMedia#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: $Type<'app.bsky.embed.recordWithMedia', 'view'> } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.recordWithMedia#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/embed/video.ts b/packages/bsky/src/lexicon/types/app/bsky/embed/video.ts
index 50eb59aa038..e504f8adce9 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/embed/video.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/embed/video.ts
@@ -2,11 +2,13 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyEmbedDefs from './defs'
 
+const id = 'app.bsky.embed.video'
+
 export interface Main {
   video: BlobRef
   captions?: Caption[]
@@ -16,17 +18,14 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.video#main' ||
-      v.$type === 'app.bsky.embed.video')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: $Type<'app.bsky.embed.video', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface Caption {
@@ -35,16 +34,14 @@ export interface Caption {
   [k: string]: unknown
 }
 
-export function isCaption(v: unknown): v is Caption {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.video#caption'
-  )
+export function isCaption(
+  v: unknown,
+): v is Caption & { $type: $Type<'app.bsky.embed.video', 'caption'> } {
+  return is$typed(v, id, 'caption')
 }
 
-export function validateCaption(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#caption', v)
+export function validateCaption(v: unknown) {
+  return lexicons.validate(`${id}#caption`, v) as ValidationResult<Caption>
 }
 
 export interface View {
@@ -56,12 +53,12 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.video#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: $Type<'app.bsky.embed.video', 'view'> } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/defs.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/defs.ts
index 1c6f6ce78f6..076792ac3c8 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/defs.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as AppBskyEmbedImages from '../embed/images'
 import * as AppBskyEmbedVideo from '../embed/video'
@@ -15,6 +15,8 @@ import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as AppBskyGraphDefs from '../graph/defs'
 
+const id = 'app.bsky.feed.defs'
+
 export interface PostView {
   uri: string
   cid: string
@@ -38,14 +40,14 @@ export interface PostView {
   [k: string]: unknown
 }
 
-export function isPostView(v: unknown): v is PostView {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.defs#postView'
-  )
+export function isPostView(
+  v: unknown,
+): v is PostView & { $type: $Type<'app.bsky.feed.defs', 'postView'> } {
+  return is$typed(v, id, 'postView')
 }
 
-export function validatePostView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#postView', v)
+export function validatePostView(v: unknown) {
+  return lexicons.validate(`${id}#postView`, v) as ValidationResult<PostView>
 }
 
 /** Metadata about the requesting account's relationship with the subject content. Only has meaningful content for authed requests. */
@@ -59,16 +61,17 @@ export interface ViewerState {
   [k: string]: unknown
 }
 
-export function isViewerState(v: unknown): v is ViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#viewerState'
-  )
+export function isViewerState(
+  v: unknown,
+): v is ViewerState & { $type: $Type<'app.bsky.feed.defs', 'viewerState'> } {
+  return is$typed(v, id, 'viewerState')
 }
 
-export function validateViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#viewerState', v)
+export function validateViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewerState`,
+    v,
+  ) as ValidationResult<ViewerState>
 }
 
 export interface FeedViewPost {
@@ -80,16 +83,17 @@ export interface FeedViewPost {
   [k: string]: unknown
 }
 
-export function isFeedViewPost(v: unknown): v is FeedViewPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#feedViewPost'
-  )
+export function isFeedViewPost(
+  v: unknown,
+): v is FeedViewPost & { $type: $Type<'app.bsky.feed.defs', 'feedViewPost'> } {
+  return is$typed(v, id, 'feedViewPost')
 }
 
-export function validateFeedViewPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#feedViewPost', v)
+export function validateFeedViewPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#feedViewPost`,
+    v,
+  ) as ValidationResult<FeedViewPost>
 }
 
 export interface ReplyRef {
@@ -107,14 +111,14 @@ export interface ReplyRef {
   [k: string]: unknown
 }
 
-export function isReplyRef(v: unknown): v is ReplyRef {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.defs#replyRef'
-  )
+export function isReplyRef(
+  v: unknown,
+): v is ReplyRef & { $type: $Type<'app.bsky.feed.defs', 'replyRef'> } {
+  return is$typed(v, id, 'replyRef')
 }
 
-export function validateReplyRef(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#replyRef', v)
+export function validateReplyRef(v: unknown) {
+  return lexicons.validate(`${id}#replyRef`, v) as ValidationResult<ReplyRef>
 }
 
 export interface ReasonRepost {
@@ -123,32 +127,31 @@ export interface ReasonRepost {
   [k: string]: unknown
 }
 
-export function isReasonRepost(v: unknown): v is ReasonRepost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#reasonRepost'
-  )
+export function isReasonRepost(
+  v: unknown,
+): v is ReasonRepost & { $type: $Type<'app.bsky.feed.defs', 'reasonRepost'> } {
+  return is$typed(v, id, 'reasonRepost')
 }
 
-export function validateReasonRepost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#reasonRepost', v)
+export function validateReasonRepost(v: unknown) {
+  return lexicons.validate(
+    `${id}#reasonRepost`,
+    v,
+  ) as ValidationResult<ReasonRepost>
 }
 
 export interface ReasonPin {
   [k: string]: unknown
 }
 
-export function isReasonPin(v: unknown): v is ReasonPin {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#reasonPin'
-  )
+export function isReasonPin(
+  v: unknown,
+): v is ReasonPin & { $type: $Type<'app.bsky.feed.defs', 'reasonPin'> } {
+  return is$typed(v, id, 'reasonPin')
 }
 
-export function validateReasonPin(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#reasonPin', v)
+export function validateReasonPin(v: unknown) {
+  return lexicons.validate(`${id}#reasonPin`, v) as ValidationResult<ReasonPin>
 }
 
 export interface ThreadViewPost {
@@ -167,16 +170,17 @@ export interface ThreadViewPost {
   [k: string]: unknown
 }
 
-export function isThreadViewPost(v: unknown): v is ThreadViewPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#threadViewPost'
-  )
+export function isThreadViewPost(v: unknown): v is ThreadViewPost & {
+  $type: $Type<'app.bsky.feed.defs', 'threadViewPost'>
+} {
+  return is$typed(v, id, 'threadViewPost')
 }
 
-export function validateThreadViewPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#threadViewPost', v)
+export function validateThreadViewPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#threadViewPost`,
+    v,
+  ) as ValidationResult<ThreadViewPost>
 }
 
 export interface NotFoundPost {
@@ -185,16 +189,17 @@ export interface NotFoundPost {
   [k: string]: unknown
 }
 
-export function isNotFoundPost(v: unknown): v is NotFoundPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#notFoundPost'
-  )
+export function isNotFoundPost(
+  v: unknown,
+): v is NotFoundPost & { $type: $Type<'app.bsky.feed.defs', 'notFoundPost'> } {
+  return is$typed(v, id, 'notFoundPost')
 }
 
-export function validateNotFoundPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#notFoundPost', v)
+export function validateNotFoundPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#notFoundPost`,
+    v,
+  ) as ValidationResult<NotFoundPost>
 }
 
 export interface BlockedPost {
@@ -204,16 +209,17 @@ export interface BlockedPost {
   [k: string]: unknown
 }
 
-export function isBlockedPost(v: unknown): v is BlockedPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#blockedPost'
-  )
+export function isBlockedPost(
+  v: unknown,
+): v is BlockedPost & { $type: $Type<'app.bsky.feed.defs', 'blockedPost'> } {
+  return is$typed(v, id, 'blockedPost')
 }
 
-export function validateBlockedPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#blockedPost', v)
+export function validateBlockedPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#blockedPost`,
+    v,
+  ) as ValidationResult<BlockedPost>
 }
 
 export interface BlockedAuthor {
@@ -222,16 +228,17 @@ export interface BlockedAuthor {
   [k: string]: unknown
 }
 
-export function isBlockedAuthor(v: unknown): v is BlockedAuthor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#blockedAuthor'
-  )
+export function isBlockedAuthor(v: unknown): v is BlockedAuthor & {
+  $type: $Type<'app.bsky.feed.defs', 'blockedAuthor'>
+} {
+  return is$typed(v, id, 'blockedAuthor')
 }
 
-export function validateBlockedAuthor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#blockedAuthor', v)
+export function validateBlockedAuthor(v: unknown) {
+  return lexicons.validate(
+    `${id}#blockedAuthor`,
+    v,
+  ) as ValidationResult<BlockedAuthor>
 }
 
 export interface GeneratorView {
@@ -251,16 +258,17 @@ export interface GeneratorView {
   [k: string]: unknown
 }
 
-export function isGeneratorView(v: unknown): v is GeneratorView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#generatorView'
-  )
+export function isGeneratorView(v: unknown): v is GeneratorView & {
+  $type: $Type<'app.bsky.feed.defs', 'generatorView'>
+} {
+  return is$typed(v, id, 'generatorView')
 }
 
-export function validateGeneratorView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#generatorView', v)
+export function validateGeneratorView(v: unknown) {
+  return lexicons.validate(
+    `${id}#generatorView`,
+    v,
+  ) as ValidationResult<GeneratorView>
 }
 
 export interface GeneratorViewerState {
@@ -268,16 +276,19 @@ export interface GeneratorViewerState {
   [k: string]: unknown
 }
 
-export function isGeneratorViewerState(v: unknown): v is GeneratorViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#generatorViewerState'
-  )
+export function isGeneratorViewerState(
+  v: unknown,
+): v is GeneratorViewerState & {
+  $type: $Type<'app.bsky.feed.defs', 'generatorViewerState'>
+} {
+  return is$typed(v, id, 'generatorViewerState')
 }
 
-export function validateGeneratorViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#generatorViewerState', v)
+export function validateGeneratorViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#generatorViewerState`,
+    v,
+  ) as ValidationResult<GeneratorViewerState>
 }
 
 export interface SkeletonFeedPost {
@@ -291,16 +302,17 @@ export interface SkeletonFeedPost {
   [k: string]: unknown
 }
 
-export function isSkeletonFeedPost(v: unknown): v is SkeletonFeedPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonFeedPost'
-  )
+export function isSkeletonFeedPost(v: unknown): v is SkeletonFeedPost & {
+  $type: $Type<'app.bsky.feed.defs', 'skeletonFeedPost'>
+} {
+  return is$typed(v, id, 'skeletonFeedPost')
 }
 
-export function validateSkeletonFeedPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonFeedPost', v)
+export function validateSkeletonFeedPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonFeedPost`,
+    v,
+  ) as ValidationResult<SkeletonFeedPost>
 }
 
 export interface SkeletonReasonRepost {
@@ -308,32 +320,36 @@ export interface SkeletonReasonRepost {
   [k: string]: unknown
 }
 
-export function isSkeletonReasonRepost(v: unknown): v is SkeletonReasonRepost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonReasonRepost'
-  )
+export function isSkeletonReasonRepost(
+  v: unknown,
+): v is SkeletonReasonRepost & {
+  $type: $Type<'app.bsky.feed.defs', 'skeletonReasonRepost'>
+} {
+  return is$typed(v, id, 'skeletonReasonRepost')
 }
 
-export function validateSkeletonReasonRepost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonReasonRepost', v)
+export function validateSkeletonReasonRepost(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonReasonRepost`,
+    v,
+  ) as ValidationResult<SkeletonReasonRepost>
 }
 
 export interface SkeletonReasonPin {
   [k: string]: unknown
 }
 
-export function isSkeletonReasonPin(v: unknown): v is SkeletonReasonPin {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonReasonPin'
-  )
+export function isSkeletonReasonPin(v: unknown): v is SkeletonReasonPin & {
+  $type: $Type<'app.bsky.feed.defs', 'skeletonReasonPin'>
+} {
+  return is$typed(v, id, 'skeletonReasonPin')
 }
 
-export function validateSkeletonReasonPin(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonReasonPin', v)
+export function validateSkeletonReasonPin(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonReasonPin`,
+    v,
+  ) as ValidationResult<SkeletonReasonPin>
 }
 
 export interface ThreadgateView {
@@ -344,16 +360,17 @@ export interface ThreadgateView {
   [k: string]: unknown
 }
 
-export function isThreadgateView(v: unknown): v is ThreadgateView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#threadgateView'
-  )
+export function isThreadgateView(v: unknown): v is ThreadgateView & {
+  $type: $Type<'app.bsky.feed.defs', 'threadgateView'>
+} {
+  return is$typed(v, id, 'threadgateView')
 }
 
-export function validateThreadgateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#threadgateView', v)
+export function validateThreadgateView(v: unknown) {
+  return lexicons.validate(
+    `${id}#threadgateView`,
+    v,
+  ) as ValidationResult<ThreadgateView>
 }
 
 export interface Interaction {
@@ -377,39 +394,40 @@ export interface Interaction {
   [k: string]: unknown
 }
 
-export function isInteraction(v: unknown): v is Interaction {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#interaction'
-  )
+export function isInteraction(
+  v: unknown,
+): v is Interaction & { $type: $Type<'app.bsky.feed.defs', 'interaction'> } {
+  return is$typed(v, id, 'interaction')
 }
 
-export function validateInteraction(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#interaction', v)
+export function validateInteraction(v: unknown) {
+  return lexicons.validate(
+    `${id}#interaction`,
+    v,
+  ) as ValidationResult<Interaction>
 }
 
 /** Request that less content like the given feed item be shown in the feed */
-export const REQUESTLESS = 'app.bsky.feed.defs#requestLess'
+export const REQUESTLESS = `${id}#requestLess`
 /** Request that more content like the given feed item be shown in the feed */
-export const REQUESTMORE = 'app.bsky.feed.defs#requestMore'
+export const REQUESTMORE = `${id}#requestMore`
 /** User clicked through to the feed item */
-export const CLICKTHROUGHITEM = 'app.bsky.feed.defs#clickthroughItem'
+export const CLICKTHROUGHITEM = `${id}#clickthroughItem`
 /** User clicked through to the author of the feed item */
-export const CLICKTHROUGHAUTHOR = 'app.bsky.feed.defs#clickthroughAuthor'
+export const CLICKTHROUGHAUTHOR = `${id}#clickthroughAuthor`
 /** User clicked through to the reposter of the feed item */
-export const CLICKTHROUGHREPOSTER = 'app.bsky.feed.defs#clickthroughReposter'
+export const CLICKTHROUGHREPOSTER = `${id}#clickthroughReposter`
 /** User clicked through to the embedded content of the feed item */
-export const CLICKTHROUGHEMBED = 'app.bsky.feed.defs#clickthroughEmbed'
+export const CLICKTHROUGHEMBED = `${id}#clickthroughEmbed`
 /** Feed item was seen by user */
-export const INTERACTIONSEEN = 'app.bsky.feed.defs#interactionSeen'
+export const INTERACTIONSEEN = `${id}#interactionSeen`
 /** User liked the feed item */
-export const INTERACTIONLIKE = 'app.bsky.feed.defs#interactionLike'
+export const INTERACTIONLIKE = `${id}#interactionLike`
 /** User reposted the feed item */
-export const INTERACTIONREPOST = 'app.bsky.feed.defs#interactionRepost'
+export const INTERACTIONREPOST = `${id}#interactionRepost`
 /** User replied to the feed item */
-export const INTERACTIONREPLY = 'app.bsky.feed.defs#interactionReply'
+export const INTERACTIONREPLY = `${id}#interactionReply`
 /** User quoted the feed item */
-export const INTERACTIONQUOTE = 'app.bsky.feed.defs#interactionQuote'
+export const INTERACTIONQUOTE = `${id}#interactionQuote`
 /** User shared the feed item */
-export const INTERACTIONSHARE = 'app.bsky.feed.defs#interactionShare'
+export const INTERACTIONSHARE = `${id}#interactionShare`
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
index 5bf8699a3ca..b2f3af11a08 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.feed.describeFeedGenerator'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -49,16 +51,14 @@ export interface Feed {
   [k: string]: unknown
 }
 
-export function isFeed(v: unknown): v is Feed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.describeFeedGenerator#feed'
-  )
+export function isFeed(
+  v: unknown,
+): v is Feed & { $type: $Type<'app.bsky.feed.describeFeedGenerator', 'feed'> } {
+  return is$typed(v, id, 'feed')
 }
 
-export function validateFeed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.describeFeedGenerator#feed', v)
+export function validateFeed(v: unknown) {
+  return lexicons.validate(`${id}#feed`, v) as ValidationResult<Feed>
 }
 
 export interface Links {
@@ -67,14 +67,12 @@ export interface Links {
   [k: string]: unknown
 }
 
-export function isLinks(v: unknown): v is Links {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.describeFeedGenerator#links'
-  )
+export function isLinks(v: unknown): v is Links & {
+  $type: $Type<'app.bsky.feed.describeFeedGenerator', 'links'>
+} {
+  return is$typed(v, id, 'links')
 }
 
-export function validateLinks(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.describeFeedGenerator#links', v)
+export function validateLinks(v: unknown) {
+  return lexicons.validate(`${id}#links`, v) as ValidationResult<Links>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/generator.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/generator.ts
index eb8e8d0f633..2fac60cbf6e 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/generator.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/generator.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const id = 'app.bsky.feed.generator'
+
 export interface Record {
   did: string
   displayName: string
@@ -23,15 +25,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.generator#main' ||
-      v.$type === 'app.bsky.feed.generator')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.feed.generator', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.generator#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getActorFeeds.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
index 0b8afff4ec8..a680bebbc7e 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getActorFeeds'
+
 export interface QueryParams {
   actor: string
   limit: number
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getActorLikes.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getActorLikes.ts
index da315ae33c7..5d2852087d7 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getActorLikes.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getActorLikes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getActorLikes'
+
 export interface QueryParams {
   actor: string
   limit: number
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
index 60fa2f74f92..7719ac0368a 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getAuthorFeed'
+
 export interface QueryParams {
   actor: string
   limit: number
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeed.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeed.ts
index e03913a6fb3..9224f829059 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeed.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeed.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getFeed'
+
 export interface QueryParams {
   feed: string
   limit: number
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
index 7ab89057a8c..c3981ea75b4 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getFeedGenerator'
+
 export interface QueryParams {
   /** AT-URI of the feed generator record. */
   feed: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
index 21963a91e2e..4745177b4b5 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getFeedGenerators'
+
 export interface QueryParams {
   feeds: string[]
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
index ca1cef20f08..07eba8c59f4 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getFeedSkeleton'
+
 export interface QueryParams {
   /** Reference to feed generator record describing the specific feed being requested. */
   feed: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getLikes.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getLikes.ts
index 275d99bba3d..190905772f5 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getLikes.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getLikes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.feed.getLikes'
+
 export interface QueryParams {
   /** AT-URI of the subject (eg, a post record). */
   uri: string
@@ -60,12 +62,12 @@ export interface Like {
   [k: string]: unknown
 }
 
-export function isLike(v: unknown): v is Like {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.getLikes#like'
-  )
+export function isLike(
+  v: unknown,
+): v is Like & { $type: $Type<'app.bsky.feed.getLikes', 'like'> } {
+  return is$typed(v, id, 'like')
 }
 
-export function validateLike(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.getLikes#like', v)
+export function validateLike(v: unknown) {
+  return lexicons.validate(`${id}#like`, v) as ValidationResult<Like>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getListFeed.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getListFeed.ts
index 84e12deaa92..a31bb6ddd62 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getListFeed.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getListFeed.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getListFeed'
+
 export interface QueryParams {
   /** Reference (AT-URI) to the list record. */
   list: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getPostThread.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getPostThread.ts
index 768977193ef..444eac417c3 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getPostThread.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getPostThread.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getPostThread'
+
 export interface QueryParams {
   /** Reference (AT-URI) to post record. */
   uri: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getPosts.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getPosts.ts
index 85000c74787..da6bf3696e2 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getPosts.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getPosts.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getPosts'
+
 export interface QueryParams {
   /** List of post AT-URIs to return hydrated views for. */
   uris: string[]
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getQuotes.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getQuotes.ts
index 38d04ad88c1..c71113bace2 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getQuotes.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getQuotes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getQuotes'
+
 export interface QueryParams {
   /** Reference (AT-URI) of post record */
   uri: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getRepostedBy.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
index 40e008815d9..25bf3c8f81b 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.feed.getRepostedBy'
+
 export interface QueryParams {
   /** Reference (AT-URI) of post record */
   uri: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
index d1ec590f33d..c34be54afdc 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getSuggestedFeeds'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/getTimeline.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/getTimeline.ts
index 5202c9eb6e3..e3f1f0ce0bc 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/getTimeline.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/getTimeline.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getTimeline'
+
 export interface QueryParams {
   /** Variant 'algorithm' for timeline. Implementation-specific. NOTE: most feed flexibility has been moved to feed generator mechanism. */
   algorithm?: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/like.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/like.ts
index 1da9dd940dc..17f3d126a33 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/like.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/like.ts
@@ -2,25 +2,25 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const id = 'app.bsky.feed.like'
+
 export interface Record {
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.like#main' || v.$type === 'app.bsky.feed.like')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.feed.like', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.like#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/post.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/post.ts
index f9f2827c8d0..cc632e3e4c8 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/post.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/post.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as AppBskyEmbedImages from '../embed/images'
 import * as AppBskyEmbedVideo from '../embed/video'
@@ -14,6 +14,8 @@ import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const id = 'app.bsky.feed.post'
+
 export interface Record {
   /** The primary post content. May be an empty string, if there are embeds. */
   text: string
@@ -41,16 +43,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.post#main' || v.$type === 'app.bsky.feed.post')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.feed.post', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 export interface ReplyRef {
@@ -59,14 +59,14 @@ export interface ReplyRef {
   [k: string]: unknown
 }
 
-export function isReplyRef(v: unknown): v is ReplyRef {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.post#replyRef'
-  )
+export function isReplyRef(
+  v: unknown,
+): v is ReplyRef & { $type: $Type<'app.bsky.feed.post', 'replyRef'> } {
+  return is$typed(v, id, 'replyRef')
 }
 
-export function validateReplyRef(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#replyRef', v)
+export function validateReplyRef(v: unknown) {
+  return lexicons.validate(`${id}#replyRef`, v) as ValidationResult<ReplyRef>
 }
 
 /** Deprecated: use facets instead. */
@@ -78,14 +78,14 @@ export interface Entity {
   [k: string]: unknown
 }
 
-export function isEntity(v: unknown): v is Entity {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.post#entity'
-  )
+export function isEntity(
+  v: unknown,
+): v is Entity & { $type: $Type<'app.bsky.feed.post', 'entity'> } {
+  return is$typed(v, id, 'entity')
 }
 
-export function validateEntity(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#entity', v)
+export function validateEntity(v: unknown) {
+  return lexicons.validate(`${id}#entity`, v) as ValidationResult<Entity>
 }
 
 /** Deprecated. Use app.bsky.richtext instead -- A text segment. Start is inclusive, end is exclusive. Indices are for utf16-encoded strings. */
@@ -95,14 +95,12 @@ export interface TextSlice {
   [k: string]: unknown
 }
 
-export function isTextSlice(v: unknown): v is TextSlice {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.post#textSlice'
-  )
+export function isTextSlice(
+  v: unknown,
+): v is TextSlice & { $type: $Type<'app.bsky.feed.post', 'textSlice'> } {
+  return is$typed(v, id, 'textSlice')
 }
 
-export function validateTextSlice(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#textSlice', v)
+export function validateTextSlice(v: unknown) {
+  return lexicons.validate(`${id}#textSlice`, v) as ValidationResult<TextSlice>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/postgate.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/postgate.ts
index dcc4c22a425..aa757b8281d 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/postgate.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/postgate.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.feed.postgate'
 
 export interface Record {
   createdAt: string
@@ -16,17 +18,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.postgate#main' ||
-      v.$type === 'app.bsky.feed.postgate')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.feed.postgate', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.postgate#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 /** Disables embedding of this post. */
@@ -34,14 +33,15 @@ export interface DisableRule {
   [k: string]: unknown
 }
 
-export function isDisableRule(v: unknown): v is DisableRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.postgate#disableRule'
-  )
+export function isDisableRule(v: unknown): v is DisableRule & {
+  $type: $Type<'app.bsky.feed.postgate', 'disableRule'>
+} {
+  return is$typed(v, id, 'disableRule')
 }
 
-export function validateDisableRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.postgate#disableRule', v)
+export function validateDisableRule(v: unknown) {
+  return lexicons.validate(
+    `${id}#disableRule`,
+    v,
+  ) as ValidationResult<DisableRule>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/repost.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/repost.ts
index 4c836d76e2a..0f1101898d5 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/repost.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/repost.ts
@@ -2,26 +2,25 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const id = 'app.bsky.feed.repost'
+
 export interface Record {
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.repost#main' ||
-      v.$type === 'app.bsky.feed.repost')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.feed.repost', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.repost#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/searchPosts.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/searchPosts.ts
index 14efa5276f8..50152c309ae 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/searchPosts.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/searchPosts.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.searchPosts'
+
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
   q: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/sendInteractions.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/sendInteractions.ts
index c22fc1cb2fb..59bc2c698b8 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/sendInteractions.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/sendInteractions.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.sendInteractions'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/feed/threadgate.ts b/packages/bsky/src/lexicon/types/app/bsky/feed/threadgate.ts
index c0e618c8f53..04a6205c8ad 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/feed/threadgate.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/feed/threadgate.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.feed.threadgate'
 
 export interface Record {
   /** Reference (AT-URI) to the post record. */
@@ -21,17 +23,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.threadgate#main' ||
-      v.$type === 'app.bsky.feed.threadgate')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.feed.threadgate', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 /** Allow replies from actors mentioned in your post. */
@@ -39,16 +38,17 @@ export interface MentionRule {
   [k: string]: unknown
 }
 
-export function isMentionRule(v: unknown): v is MentionRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#mentionRule'
-  )
+export function isMentionRule(v: unknown): v is MentionRule & {
+  $type: $Type<'app.bsky.feed.threadgate', 'mentionRule'>
+} {
+  return is$typed(v, id, 'mentionRule')
 }
 
-export function validateMentionRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#mentionRule', v)
+export function validateMentionRule(v: unknown) {
+  return lexicons.validate(
+    `${id}#mentionRule`,
+    v,
+  ) as ValidationResult<MentionRule>
 }
 
 /** Allow replies from actors you follow. */
@@ -56,16 +56,17 @@ export interface FollowingRule {
   [k: string]: unknown
 }
 
-export function isFollowingRule(v: unknown): v is FollowingRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#followingRule'
-  )
+export function isFollowingRule(v: unknown): v is FollowingRule & {
+  $type: $Type<'app.bsky.feed.threadgate', 'followingRule'>
+} {
+  return is$typed(v, id, 'followingRule')
 }
 
-export function validateFollowingRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#followingRule', v)
+export function validateFollowingRule(v: unknown) {
+  return lexicons.validate(
+    `${id}#followingRule`,
+    v,
+  ) as ValidationResult<FollowingRule>
 }
 
 /** Allow replies from actors on a list. */
@@ -74,14 +75,12 @@ export interface ListRule {
   [k: string]: unknown
 }
 
-export function isListRule(v: unknown): v is ListRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#listRule'
-  )
+export function isListRule(
+  v: unknown,
+): v is ListRule & { $type: $Type<'app.bsky.feed.threadgate', 'listRule'> } {
+  return is$typed(v, id, 'listRule')
 }
 
-export function validateListRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#listRule', v)
+export function validateListRule(v: unknown) {
+  return lexicons.validate(`${id}#listRule`, v) as ValidationResult<ListRule>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/block.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/block.ts
index b7f19f126b7..167afdf2f9b 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/block.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/block.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.graph.block'
 
 export interface Record {
   /** DID of the account to be blocked. */
@@ -13,15 +15,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.block#main' ||
-      v.$type === 'app.bsky.graph.block')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.graph.block', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.block#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/defs.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/defs.ts
index 63ecf7e00c0..08792d3103a 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/defs.ts
@@ -2,14 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as AppBskyFeedDefs from '../feed/defs'
 
+const id = 'app.bsky.graph.defs'
+
 export interface ListViewBasic {
   uri: string
   cid: string
@@ -23,16 +25,17 @@ export interface ListViewBasic {
   [k: string]: unknown
 }
 
-export function isListViewBasic(v: unknown): v is ListViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listViewBasic'
-  )
+export function isListViewBasic(v: unknown): v is ListViewBasic & {
+  $type: $Type<'app.bsky.graph.defs', 'listViewBasic'>
+} {
+  return is$typed(v, id, 'listViewBasic')
 }
 
-export function validateListViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listViewBasic', v)
+export function validateListViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#listViewBasic`,
+    v,
+  ) as ValidationResult<ListViewBasic>
 }
 
 export interface ListView {
@@ -51,16 +54,14 @@ export interface ListView {
   [k: string]: unknown
 }
 
-export function isListView(v: unknown): v is ListView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listView'
-  )
+export function isListView(
+  v: unknown,
+): v is ListView & { $type: $Type<'app.bsky.graph.defs', 'listView'> } {
+  return is$typed(v, id, 'listView')
 }
 
-export function validateListView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listView', v)
+export function validateListView(v: unknown) {
+  return lexicons.validate(`${id}#listView`, v) as ValidationResult<ListView>
 }
 
 export interface ListItemView {
@@ -69,16 +70,17 @@ export interface ListItemView {
   [k: string]: unknown
 }
 
-export function isListItemView(v: unknown): v is ListItemView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listItemView'
-  )
+export function isListItemView(
+  v: unknown,
+): v is ListItemView & { $type: $Type<'app.bsky.graph.defs', 'listItemView'> } {
+  return is$typed(v, id, 'listItemView')
 }
 
-export function validateListItemView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listItemView', v)
+export function validateListItemView(v: unknown) {
+  return lexicons.validate(
+    `${id}#listItemView`,
+    v,
+  ) as ValidationResult<ListItemView>
 }
 
 export interface StarterPackView {
@@ -96,16 +98,17 @@ export interface StarterPackView {
   [k: string]: unknown
 }
 
-export function isStarterPackView(v: unknown): v is StarterPackView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#starterPackView'
-  )
+export function isStarterPackView(v: unknown): v is StarterPackView & {
+  $type: $Type<'app.bsky.graph.defs', 'starterPackView'>
+} {
+  return is$typed(v, id, 'starterPackView')
 }
 
-export function validateStarterPackView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#starterPackView', v)
+export function validateStarterPackView(v: unknown) {
+  return lexicons.validate(
+    `${id}#starterPackView`,
+    v,
+  ) as ValidationResult<StarterPackView>
 }
 
 export interface StarterPackViewBasic {
@@ -121,16 +124,19 @@ export interface StarterPackViewBasic {
   [k: string]: unknown
 }
 
-export function isStarterPackViewBasic(v: unknown): v is StarterPackViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#starterPackViewBasic'
-  )
+export function isStarterPackViewBasic(
+  v: unknown,
+): v is StarterPackViewBasic & {
+  $type: $Type<'app.bsky.graph.defs', 'starterPackViewBasic'>
+} {
+  return is$typed(v, id, 'starterPackViewBasic')
 }
 
-export function validateStarterPackViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#starterPackViewBasic', v)
+export function validateStarterPackViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#starterPackViewBasic`,
+    v,
+  ) as ValidationResult<StarterPackViewBasic>
 }
 
 export type ListPurpose =
@@ -140,11 +146,11 @@ export type ListPurpose =
   | (string & {})
 
 /** A list of actors to apply an aggregate moderation action (mute/block) on. */
-export const MODLIST = 'app.bsky.graph.defs#modlist'
+export const MODLIST = `${id}#modlist`
 /** A list of actors used for curation purposes such as list feeds or interaction gating. */
-export const CURATELIST = 'app.bsky.graph.defs#curatelist'
+export const CURATELIST = `${id}#curatelist`
 /** A list of actors used for only for reference purposes such as within a starter pack. */
-export const REFERENCELIST = 'app.bsky.graph.defs#referencelist'
+export const REFERENCELIST = `${id}#referencelist`
 
 export interface ListViewerState {
   muted?: boolean
@@ -152,16 +158,17 @@ export interface ListViewerState {
   [k: string]: unknown
 }
 
-export function isListViewerState(v: unknown): v is ListViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listViewerState'
-  )
+export function isListViewerState(v: unknown): v is ListViewerState & {
+  $type: $Type<'app.bsky.graph.defs', 'listViewerState'>
+} {
+  return is$typed(v, id, 'listViewerState')
 }
 
-export function validateListViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listViewerState', v)
+export function validateListViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#listViewerState`,
+    v,
+  ) as ValidationResult<ListViewerState>
 }
 
 /** indicates that a handle or DID could not be resolved */
@@ -171,16 +178,17 @@ export interface NotFoundActor {
   [k: string]: unknown
 }
 
-export function isNotFoundActor(v: unknown): v is NotFoundActor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#notFoundActor'
-  )
+export function isNotFoundActor(v: unknown): v is NotFoundActor & {
+  $type: $Type<'app.bsky.graph.defs', 'notFoundActor'>
+} {
+  return is$typed(v, id, 'notFoundActor')
 }
 
-export function validateNotFoundActor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#notFoundActor', v)
+export function validateNotFoundActor(v: unknown) {
+  return lexicons.validate(
+    `${id}#notFoundActor`,
+    v,
+  ) as ValidationResult<NotFoundActor>
 }
 
 /** lists the bi-directional graph relationships between one actor (not indicated in the object), and the target actors (the DID included in the object) */
@@ -193,14 +201,15 @@ export interface Relationship {
   [k: string]: unknown
 }
 
-export function isRelationship(v: unknown): v is Relationship {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#relationship'
-  )
+export function isRelationship(
+  v: unknown,
+): v is Relationship & { $type: $Type<'app.bsky.graph.defs', 'relationship'> } {
+  return is$typed(v, id, 'relationship')
 }
 
-export function validateRelationship(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#relationship', v)
+export function validateRelationship(v: unknown) {
+  return lexicons.validate(
+    `${id}#relationship`,
+    v,
+  ) as ValidationResult<Relationship>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/follow.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/follow.ts
index 4b74a58a5df..bb0f2d2dc3a 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/follow.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/follow.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.graph.follow'
 
 export interface Record {
   subject: string
@@ -12,15 +14,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.follow#main' ||
-      v.$type === 'app.bsky.graph.follow')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.graph.follow', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.follow#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
index 10250d0f3b4..ee9a8af4999 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getActorStarterPacks'
+
 export interface QueryParams {
   actor: string
   limit: number
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getBlocks.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getBlocks.ts
index 1fc9cd8ce37..d353dc99267 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getBlocks.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getBlocks.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.graph.getBlocks'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getFollowers.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getFollowers.ts
index f5645eaef29..a44fe4c7ca9 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getFollowers.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getFollowers.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.graph.getFollowers'
+
 export interface QueryParams {
   actor: string
   limit: number
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getFollows.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getFollows.ts
index b9bd249da45..af3b8214783 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getFollows.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getFollows.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.graph.getFollows'
+
 export interface QueryParams {
   actor: string
   limit: number
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
index f5645eaef29..0cdb01d99df 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.graph.getKnownFollowers'
+
 export interface QueryParams {
   actor: string
   limit: number
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getList.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getList.ts
index 864a81b3833..444d463f7be 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getList.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getList.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getList'
+
 export interface QueryParams {
   /** Reference (AT-URI) of the list record to hydrate. */
   list: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getListBlocks.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getListBlocks.ts
index 7399a14fadc..2828969d77c 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getListBlocks.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getListBlocks.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getListBlocks'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getListMutes.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getListMutes.ts
index 7399a14fadc..25fc22a45e7 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getListMutes.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getListMutes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getListMutes'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getLists.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getLists.ts
index dc0c4f18bea..04c1e929899 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getLists.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getLists.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getLists'
+
 export interface QueryParams {
   /** The account (actor) to enumerate lists from. */
   actor: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getMutes.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getMutes.ts
index f450393522d..fcfbadd3154 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getMutes.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getMutes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.graph.getMutes'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getRelationships.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getRelationships.ts
index bd6b6e765ed..b169bc9de7e 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getRelationships.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getRelationships.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getRelationships'
+
 export interface QueryParams {
   /** Primary account requesting relationships for. */
   actor: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPack.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPack.ts
index 93fe21f0b13..906e412e1c5 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPack.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPack.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getStarterPack'
+
 export interface QueryParams {
   /** Reference (AT-URI) of the starter pack record. */
   starterPack: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPacks.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
index 4b9757b941e..829cfa6bc94 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getStarterPacks'
+
 export interface QueryParams {
   uris: string[]
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
index 99b97e708f5..7a59fd5716d 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.graph.getSuggestedFollowsByActor'
+
 export interface QueryParams {
   actor: string
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/list.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/list.ts
index 91c8ccee5bb..4fc99ad59d4 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/list.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/list.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyGraphDefs from './defs'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const id = 'app.bsky.graph.list'
+
 export interface Record {
   purpose: AppBskyGraphDefs.ListPurpose
   /** Display name for list; can not be empty. */
@@ -23,15 +25,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.list#main' ||
-      v.$type === 'app.bsky.graph.list')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.graph.list', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.list#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/listblock.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/listblock.ts
index 592778c7a51..e159ed9b6d1 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/listblock.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/listblock.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.graph.listblock'
 
 export interface Record {
   /** Reference (AT-URI) to the mod list record. */
@@ -13,15 +15,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.listblock#main' ||
-      v.$type === 'app.bsky.graph.listblock')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.graph.listblock', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.listblock#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/listitem.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/listitem.ts
index 5e93b34a111..164196cfc25 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/listitem.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/listitem.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.graph.listitem'
 
 export interface Record {
   /** The account which is included on the list. */
@@ -15,15 +17,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.listitem#main' ||
-      v.$type === 'app.bsky.graph.listitem')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.graph.listitem', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.listitem#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/muteActor.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/muteActor.ts
index baa9844046a..aa9b7a1b950 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/muteActor.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/muteActor.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.graph.muteActor'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/muteActorList.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/muteActorList.ts
index 6a68f680a1c..0acc1da0dc2 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/muteActorList.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/muteActorList.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.graph.muteActorList'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/muteThread.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/muteThread.ts
index 928c56b6fc3..552bff9572f 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/muteThread.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/muteThread.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.graph.muteThread'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
index dea496aa50f..643bb579fe1 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.searchStarterPacks'
+
 export interface QueryParams {
   /** Search query string. Syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
   q: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/starterpack.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/starterpack.ts
index 0daf8daf688..d7cb5b48930 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/starterpack.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/starterpack.ts
@@ -2,11 +2,13 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 
+const id = 'app.bsky.graph.starterpack'
+
 export interface Record {
   /** Display name for starter pack; can not be empty. */
   name: string
@@ -19,17 +21,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.starterpack#main' ||
-      v.$type === 'app.bsky.graph.starterpack')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.graph.starterpack', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.starterpack#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 export interface FeedItem {
@@ -37,14 +36,12 @@ export interface FeedItem {
   [k: string]: unknown
 }
 
-export function isFeedItem(v: unknown): v is FeedItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.starterpack#feedItem'
-  )
+export function isFeedItem(
+  v: unknown,
+): v is FeedItem & { $type: $Type<'app.bsky.graph.starterpack', 'feedItem'> } {
+  return is$typed(v, id, 'feedItem')
 }
 
-export function validateFeedItem(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.starterpack#feedItem', v)
+export function validateFeedItem(v: unknown) {
+  return lexicons.validate(`${id}#feedItem`, v) as ValidationResult<FeedItem>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActor.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActor.ts
index baa9844046a..74e02903ed7 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActor.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActor.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.graph.unmuteActor'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActorList.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
index 6a68f680a1c..44fc69490f8 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.graph.unmuteActorList'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteThread.ts b/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteThread.ts
index 928c56b6fc3..135db7e8e4f 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteThread.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/graph/unmuteThread.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.graph.unmuteThread'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/labeler/defs.ts b/packages/bsky/src/lexicon/types/app/bsky/labeler/defs.ts
index e12c7203c57..461e2b33cbd 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/labeler/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/labeler/defs.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const id = 'app.bsky.labeler.defs'
+
 export interface LabelerView {
   uri: string
   cid: string
@@ -19,16 +21,17 @@ export interface LabelerView {
   [k: string]: unknown
 }
 
-export function isLabelerView(v: unknown): v is LabelerView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerView'
-  )
+export function isLabelerView(
+  v: unknown,
+): v is LabelerView & { $type: $Type<'app.bsky.labeler.defs', 'labelerView'> } {
+  return is$typed(v, id, 'labelerView')
 }
 
-export function validateLabelerView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerView', v)
+export function validateLabelerView(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerView`,
+    v,
+  ) as ValidationResult<LabelerView>
 }
 
 export interface LabelerViewDetailed {
@@ -43,16 +46,17 @@ export interface LabelerViewDetailed {
   [k: string]: unknown
 }
 
-export function isLabelerViewDetailed(v: unknown): v is LabelerViewDetailed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerViewDetailed'
-  )
+export function isLabelerViewDetailed(v: unknown): v is LabelerViewDetailed & {
+  $type: $Type<'app.bsky.labeler.defs', 'labelerViewDetailed'>
+} {
+  return is$typed(v, id, 'labelerViewDetailed')
 }
 
-export function validateLabelerViewDetailed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerViewDetailed', v)
+export function validateLabelerViewDetailed(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerViewDetailed`,
+    v,
+  ) as ValidationResult<LabelerViewDetailed>
 }
 
 export interface LabelerViewerState {
@@ -60,16 +64,17 @@ export interface LabelerViewerState {
   [k: string]: unknown
 }
 
-export function isLabelerViewerState(v: unknown): v is LabelerViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerViewerState'
-  )
+export function isLabelerViewerState(v: unknown): v is LabelerViewerState & {
+  $type: $Type<'app.bsky.labeler.defs', 'labelerViewerState'>
+} {
+  return is$typed(v, id, 'labelerViewerState')
 }
 
-export function validateLabelerViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerViewerState', v)
+export function validateLabelerViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerViewerState`,
+    v,
+  ) as ValidationResult<LabelerViewerState>
 }
 
 export interface LabelerPolicies {
@@ -80,14 +85,15 @@ export interface LabelerPolicies {
   [k: string]: unknown
 }
 
-export function isLabelerPolicies(v: unknown): v is LabelerPolicies {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerPolicies'
-  )
+export function isLabelerPolicies(v: unknown): v is LabelerPolicies & {
+  $type: $Type<'app.bsky.labeler.defs', 'labelerPolicies'>
+} {
+  return is$typed(v, id, 'labelerPolicies')
 }
 
-export function validateLabelerPolicies(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerPolicies', v)
+export function validateLabelerPolicies(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerPolicies`,
+    v,
+  ) as ValidationResult<LabelerPolicies>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/labeler/getServices.ts b/packages/bsky/src/lexicon/types/app/bsky/labeler/getServices.ts
index faeb30b4798..c80da11262f 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/labeler/getServices.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/labeler/getServices.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyLabelerDefs from './defs'
 
+const id = 'app.bsky.labeler.getServices'
+
 export interface QueryParams {
   dids: string[]
   detailed: boolean
diff --git a/packages/bsky/src/lexicon/types/app/bsky/labeler/service.ts b/packages/bsky/src/lexicon/types/app/bsky/labeler/service.ts
index a044b8699b6..0abc40dc8d1 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/labeler/service.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/labeler/service.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyLabelerDefs from './defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const id = 'app.bsky.labeler.service'
+
 export interface Record {
   policies: AppBskyLabelerDefs.LabelerPolicies
   labels?:
@@ -17,15 +19,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.labeler.service#main' ||
-      v.$type === 'app.bsky.labeler.service')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.labeler.service', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.service#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/notification/getUnreadCount.ts b/packages/bsky/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
index 3931e24d3f0..d52044a760b 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.notification.getUnreadCount'
+
 export interface QueryParams {
   priority?: boolean
   seenAt?: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/notification/listNotifications.ts b/packages/bsky/src/lexicon/types/app/bsky/notification/listNotifications.ts
index 88fe90a0518..29af61a9449 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/notification/listNotifications.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/notification/listNotifications.ts
@@ -3,13 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const id = 'app.bsky.notification.listNotifications'
+
 export interface QueryParams {
   /** Notification reasons to include in response. */
   reasons?: string[]
@@ -76,17 +78,15 @@ export interface Notification {
   [k: string]: unknown
 }
 
-export function isNotification(v: unknown): v is Notification {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.notification.listNotifications#notification'
-  )
+export function isNotification(v: unknown): v is Notification & {
+  $type: $Type<'app.bsky.notification.listNotifications', 'notification'>
+} {
+  return is$typed(v, id, 'notification')
 }
 
-export function validateNotification(v: unknown): ValidationResult {
+export function validateNotification(v: unknown) {
   return lexicons.validate(
-    'app.bsky.notification.listNotifications#notification',
+    `${id}#notification`,
     v,
-  )
+  ) as ValidationResult<Notification>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/notification/putPreferences.ts b/packages/bsky/src/lexicon/types/app/bsky/notification/putPreferences.ts
index 2c3a9d6fdbb..0b5a9f066ad 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/notification/putPreferences.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/notification/putPreferences.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.notification.putPreferences'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/notification/registerPush.ts b/packages/bsky/src/lexicon/types/app/bsky/notification/registerPush.ts
index cce8f95839d..516babda578 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/notification/registerPush.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/notification/registerPush.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.notification.registerPush'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/notification/updateSeen.ts b/packages/bsky/src/lexicon/types/app/bsky/notification/updateSeen.ts
index 93db017a152..6312ceeaa15 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/notification/updateSeen.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/notification/updateSeen.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.notification.updateSeen'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/app/bsky/richtext/facet.ts b/packages/bsky/src/lexicon/types/app/bsky/richtext/facet.ts
index 139b5382caf..0a14274b608 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/richtext/facet.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/richtext/facet.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.richtext.facet'
 
 /** Annotation of a sub-string within rich text. */
 export interface Main {
@@ -13,17 +15,14 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.richtext.facet#main' ||
-      v.$type === 'app.bsky.richtext.facet')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: $Type<'app.bsky.richtext.facet', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 /** Facet feature for mention of another account. The text is usually a handle, including a '@' prefix, but the facet reference is a DID. */
@@ -32,16 +31,14 @@ export interface Mention {
   [k: string]: unknown
 }
 
-export function isMention(v: unknown): v is Mention {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#mention'
-  )
+export function isMention(
+  v: unknown,
+): v is Mention & { $type: $Type<'app.bsky.richtext.facet', 'mention'> } {
+  return is$typed(v, id, 'mention')
 }
 
-export function validateMention(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#mention', v)
+export function validateMention(v: unknown) {
+  return lexicons.validate(`${id}#mention`, v) as ValidationResult<Mention>
 }
 
 /** Facet feature for a URL. The text URL may have been simplified or truncated, but the facet reference should be a complete URL. */
@@ -50,16 +47,14 @@ export interface Link {
   [k: string]: unknown
 }
 
-export function isLink(v: unknown): v is Link {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#link'
-  )
+export function isLink(
+  v: unknown,
+): v is Link & { $type: $Type<'app.bsky.richtext.facet', 'link'> } {
+  return is$typed(v, id, 'link')
 }
 
-export function validateLink(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#link', v)
+export function validateLink(v: unknown) {
+  return lexicons.validate(`${id}#link`, v) as ValidationResult<Link>
 }
 
 /** Facet feature for a hashtag. The text usually includes a '#' prefix, but the facet reference should not (except in the case of 'double hash tags'). */
@@ -68,14 +63,14 @@ export interface Tag {
   [k: string]: unknown
 }
 
-export function isTag(v: unknown): v is Tag {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.richtext.facet#tag'
-  )
+export function isTag(
+  v: unknown,
+): v is Tag & { $type: $Type<'app.bsky.richtext.facet', 'tag'> } {
+  return is$typed(v, id, 'tag')
 }
 
-export function validateTag(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#tag', v)
+export function validateTag(v: unknown) {
+  return lexicons.validate(`${id}#tag`, v) as ValidationResult<Tag>
 }
 
 /** Specifies the sub-string range a facet feature applies to. Start index is inclusive, end index is exclusive. Indices are zero-indexed, counting bytes of the UTF-8 encoded text. NOTE: some languages, like Javascript, use UTF-16 or Unicode codepoints for string slice indexing; in these languages, convert to byte arrays before working with facets. */
@@ -85,14 +80,12 @@ export interface ByteSlice {
   [k: string]: unknown
 }
 
-export function isByteSlice(v: unknown): v is ByteSlice {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#byteSlice'
-  )
+export function isByteSlice(
+  v: unknown,
+): v is ByteSlice & { $type: $Type<'app.bsky.richtext.facet', 'byteSlice'> } {
+  return is$typed(v, id, 'byteSlice')
 }
 
-export function validateByteSlice(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#byteSlice', v)
+export function validateByteSlice(v: unknown) {
+  return lexicons.validate(`${id}#byteSlice`, v) as ValidationResult<ByteSlice>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/defs.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/defs.ts
index f25e35853c5..a8432782ce5 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/defs.ts
@@ -2,25 +2,28 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.unspecced.defs'
 
 export interface SkeletonSearchPost {
   uri: string
   [k: string]: unknown
 }
 
-export function isSkeletonSearchPost(v: unknown): v is SkeletonSearchPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchPost'
-  )
+export function isSkeletonSearchPost(v: unknown): v is SkeletonSearchPost & {
+  $type: $Type<'app.bsky.unspecced.defs', 'skeletonSearchPost'>
+} {
+  return is$typed(v, id, 'skeletonSearchPost')
 }
 
-export function validateSkeletonSearchPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#skeletonSearchPost', v)
+export function validateSkeletonSearchPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonSearchPost`,
+    v,
+  ) as ValidationResult<SkeletonSearchPost>
 }
 
 export interface SkeletonSearchActor {
@@ -28,16 +31,17 @@ export interface SkeletonSearchActor {
   [k: string]: unknown
 }
 
-export function isSkeletonSearchActor(v: unknown): v is SkeletonSearchActor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchActor'
-  )
+export function isSkeletonSearchActor(v: unknown): v is SkeletonSearchActor & {
+  $type: $Type<'app.bsky.unspecced.defs', 'skeletonSearchActor'>
+} {
+  return is$typed(v, id, 'skeletonSearchActor')
 }
 
-export function validateSkeletonSearchActor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#skeletonSearchActor', v)
+export function validateSkeletonSearchActor(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonSearchActor`,
+    v,
+  ) as ValidationResult<SkeletonSearchActor>
 }
 
 export interface SkeletonSearchStarterPack {
@@ -47,21 +51,17 @@ export interface SkeletonSearchStarterPack {
 
 export function isSkeletonSearchStarterPack(
   v: unknown,
-): v is SkeletonSearchStarterPack {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchStarterPack'
-  )
+): v is SkeletonSearchStarterPack & {
+  $type: $Type<'app.bsky.unspecced.defs', 'skeletonSearchStarterPack'>
+} {
+  return is$typed(v, id, 'skeletonSearchStarterPack')
 }
 
-export function validateSkeletonSearchStarterPack(
-  v: unknown,
-): ValidationResult {
+export function validateSkeletonSearchStarterPack(v: unknown) {
   return lexicons.validate(
-    'app.bsky.unspecced.defs#skeletonSearchStarterPack',
+    `${id}#skeletonSearchStarterPack`,
     v,
-  )
+  ) as ValidationResult<SkeletonSearchStarterPack>
 }
 
 export interface TrendingTopic {
@@ -72,14 +72,15 @@ export interface TrendingTopic {
   [k: string]: unknown
 }
 
-export function isTrendingTopic(v: unknown): v is TrendingTopic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#trendingTopic'
-  )
+export function isTrendingTopic(v: unknown): v is TrendingTopic & {
+  $type: $Type<'app.bsky.unspecced.defs', 'trendingTopic'>
+} {
+  return is$typed(v, id, 'trendingTopic')
 }
 
-export function validateTrendingTopic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#trendingTopic', v)
+export function validateTrendingTopic(v: unknown) {
+  return lexicons.validate(
+    `${id}#trendingTopic`,
+    v,
+  ) as ValidationResult<TrendingTopic>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getConfig.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getConfig.ts
index da202ab0d54..b9e45fd96ce 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getConfig.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getConfig.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.unspecced.getConfig'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
index 02f19f3cc6a..20a45bc5992 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from '../feed/defs'
 
+const id = 'app.bsky.unspecced.getPopularFeedGenerators'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
index b801fa34d72..579973036a5 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyUnspeccedDefs from './defs'
 
+const id = 'app.bsky.unspecced.getSuggestionsSkeleton'
+
 export interface QueryParams {
   /** DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking. */
   viewer?: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
index a03f442140d..25e2c3b0ea3 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.unspecced.getTaggedSuggestions'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -49,17 +51,15 @@ export interface Suggestion {
   [k: string]: unknown
 }
 
-export function isSuggestion(v: unknown): v is Suggestion {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.getTaggedSuggestions#suggestion'
-  )
+export function isSuggestion(v: unknown): v is Suggestion & {
+  $type: $Type<'app.bsky.unspecced.getTaggedSuggestions', 'suggestion'>
+} {
+  return is$typed(v, id, 'suggestion')
 }
 
-export function validateSuggestion(v: unknown): ValidationResult {
+export function validateSuggestion(v: unknown) {
   return lexicons.validate(
-    'app.bsky.unspecced.getTaggedSuggestions#suggestion',
+    `${id}#suggestion`,
     v,
-  )
+  ) as ValidationResult<Suggestion>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
index 51b78652a74..47a4ac1a5b0 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyUnspeccedDefs from './defs'
 
+const id = 'app.bsky.unspecced.getTrendingTopics'
+
 export interface QueryParams {
   /** DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking. */
   viewer?: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
index 94295f45349..b4206a089b9 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyUnspeccedDefs from './defs'
 
+const id = 'app.bsky.unspecced.searchActorsSkeleton'
+
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. For typeahead search, only simple term match is supported, not full syntax. */
   q: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
index cd293454902..16b2ff87428 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyUnspeccedDefs from './defs'
 
+const id = 'app.bsky.unspecced.searchPostsSkeleton'
+
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
   q: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts b/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
index e980d884fec..6927713a2e4 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyUnspeccedDefs from './defs'
 
+const id = 'app.bsky.unspecced.searchStarterPacksSkeleton'
+
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
   q: string
diff --git a/packages/bsky/src/lexicon/types/app/bsky/video/defs.ts b/packages/bsky/src/lexicon/types/app/bsky/video/defs.ts
index 12f4d674794..7b82931c46c 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/video/defs.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/video/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.video.defs'
 
 export interface JobStatus {
   jobId: string
@@ -19,14 +21,12 @@ export interface JobStatus {
   [k: string]: unknown
 }
 
-export function isJobStatus(v: unknown): v is JobStatus {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.video.defs#jobStatus'
-  )
+export function isJobStatus(
+  v: unknown,
+): v is JobStatus & { $type: $Type<'app.bsky.video.defs', 'jobStatus'> } {
+  return is$typed(v, id, 'jobStatus')
 }
 
-export function validateJobStatus(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.video.defs#jobStatus', v)
+export function validateJobStatus(v: unknown) {
+  return lexicons.validate(`${id}#jobStatus`, v) as ValidationResult<JobStatus>
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/video/getJobStatus.ts b/packages/bsky/src/lexicon/types/app/bsky/video/getJobStatus.ts
index 3e075ba2195..6cea4453ace 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/video/getJobStatus.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/video/getJobStatus.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyVideoDefs from './defs'
 
+const id = 'app.bsky.video.getJobStatus'
+
 export interface QueryParams {
   jobId: string
 }
diff --git a/packages/bsky/src/lexicon/types/app/bsky/video/getUploadLimits.ts b/packages/bsky/src/lexicon/types/app/bsky/video/getUploadLimits.ts
index f0f23003b0b..e1a2c8a12f8 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/video/getUploadLimits.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/video/getUploadLimits.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.video.getUploadLimits'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/bsky/src/lexicon/types/app/bsky/video/uploadVideo.ts b/packages/bsky/src/lexicon/types/app/bsky/video/uploadVideo.ts
index c23ff677a4b..85e0beeb811 100644
--- a/packages/bsky/src/lexicon/types/app/bsky/video/uploadVideo.ts
+++ b/packages/bsky/src/lexicon/types/app/bsky/video/uploadVideo.ts
@@ -4,12 +4,14 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyVideoDefs from './defs'
 
+const id = 'app.bsky.video.uploadVideo'
+
 export interface QueryParams {}
 
 export type InputSchema = string | Uint8Array | Blob
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/actor/declaration.ts b/packages/bsky/src/lexicon/types/chat/bsky/actor/declaration.ts
index b837351c1e1..454bd9edf6f 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/actor/declaration.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/actor/declaration.ts
@@ -2,24 +2,23 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'chat.bsky.actor.declaration'
 
 export interface Record {
   allowIncoming: 'all' | 'none' | 'following' | (string & {})
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'chat.bsky.actor.declaration#main' ||
-      v.$type === 'chat.bsky.actor.declaration')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'chat.bsky.actor.declaration', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.actor.declaration#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/actor/defs.ts b/packages/bsky/src/lexicon/types/chat/bsky/actor/defs.ts
index 8a05d480784..858aaa5a69e 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/actor/defs.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/actor/defs.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const id = 'chat.bsky.actor.defs'
+
 export interface ProfileViewBasic {
   did: string
   handle: string
@@ -21,14 +23,15 @@ export interface ProfileViewBasic {
   [k: string]: unknown
 }
 
-export function isProfileViewBasic(v: unknown): v is ProfileViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.actor.defs#profileViewBasic'
-  )
+export function isProfileViewBasic(v: unknown): v is ProfileViewBasic & {
+  $type: $Type<'chat.bsky.actor.defs', 'profileViewBasic'>
+} {
+  return is$typed(v, id, 'profileViewBasic')
 }
 
-export function validateProfileViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.actor.defs#profileViewBasic', v)
+export function validateProfileViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileViewBasic`,
+    v,
+  ) as ValidationResult<ProfileViewBasic>
 }
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/actor/deleteAccount.ts b/packages/bsky/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
index 08714990fcb..c45ee77d22e 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'chat.bsky.actor.deleteAccount'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/actor/exportAccountData.ts b/packages/bsky/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
index f6f38ab2fb3..aa37fb7e366 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'chat.bsky.actor.exportAccountData'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/defs.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/defs.ts
index b2452410be2..d802616974a 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/defs.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/defs.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyRichtextFacet from '../../../app/bsky/richtext/facet'
 import * as AppBskyEmbedRecord from '../../../app/bsky/embed/record'
 import * as ChatBskyActorDefs from '../actor/defs'
 
+const id = 'chat.bsky.convo.defs'
+
 export interface MessageRef {
   did: string
   convoId: string
@@ -16,16 +18,17 @@ export interface MessageRef {
   [k: string]: unknown
 }
 
-export function isMessageRef(v: unknown): v is MessageRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageRef'
-  )
+export function isMessageRef(
+  v: unknown,
+): v is MessageRef & { $type: $Type<'chat.bsky.convo.defs', 'messageRef'> } {
+  return is$typed(v, id, 'messageRef')
 }
 
-export function validateMessageRef(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageRef', v)
+export function validateMessageRef(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageRef`,
+    v,
+  ) as ValidationResult<MessageRef>
 }
 
 export interface MessageInput {
@@ -36,16 +39,17 @@ export interface MessageInput {
   [k: string]: unknown
 }
 
-export function isMessageInput(v: unknown): v is MessageInput {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageInput'
-  )
+export function isMessageInput(v: unknown): v is MessageInput & {
+  $type: $Type<'chat.bsky.convo.defs', 'messageInput'>
+} {
+  return is$typed(v, id, 'messageInput')
 }
 
-export function validateMessageInput(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageInput', v)
+export function validateMessageInput(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageInput`,
+    v,
+  ) as ValidationResult<MessageInput>
 }
 
 export interface MessageView {
@@ -60,16 +64,17 @@ export interface MessageView {
   [k: string]: unknown
 }
 
-export function isMessageView(v: unknown): v is MessageView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageView'
-  )
+export function isMessageView(
+  v: unknown,
+): v is MessageView & { $type: $Type<'chat.bsky.convo.defs', 'messageView'> } {
+  return is$typed(v, id, 'messageView')
 }
 
-export function validateMessageView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageView', v)
+export function validateMessageView(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageView`,
+    v,
+  ) as ValidationResult<MessageView>
 }
 
 export interface DeletedMessageView {
@@ -80,16 +85,17 @@ export interface DeletedMessageView {
   [k: string]: unknown
 }
 
-export function isDeletedMessageView(v: unknown): v is DeletedMessageView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#deletedMessageView'
-  )
+export function isDeletedMessageView(v: unknown): v is DeletedMessageView & {
+  $type: $Type<'chat.bsky.convo.defs', 'deletedMessageView'>
+} {
+  return is$typed(v, id, 'deletedMessageView')
 }
 
-export function validateDeletedMessageView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#deletedMessageView', v)
+export function validateDeletedMessageView(v: unknown) {
+  return lexicons.validate(
+    `${id}#deletedMessageView`,
+    v,
+  ) as ValidationResult<DeletedMessageView>
 }
 
 export interface MessageViewSender {
@@ -97,16 +103,17 @@ export interface MessageViewSender {
   [k: string]: unknown
 }
 
-export function isMessageViewSender(v: unknown): v is MessageViewSender {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageViewSender'
-  )
+export function isMessageViewSender(v: unknown): v is MessageViewSender & {
+  $type: $Type<'chat.bsky.convo.defs', 'messageViewSender'>
+} {
+  return is$typed(v, id, 'messageViewSender')
 }
 
-export function validateMessageViewSender(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageViewSender', v)
+export function validateMessageViewSender(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageViewSender`,
+    v,
+  ) as ValidationResult<MessageViewSender>
 }
 
 export interface ConvoView {
@@ -123,16 +130,14 @@ export interface ConvoView {
   [k: string]: unknown
 }
 
-export function isConvoView(v: unknown): v is ConvoView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#convoView'
-  )
+export function isConvoView(
+  v: unknown,
+): v is ConvoView & { $type: $Type<'chat.bsky.convo.defs', 'convoView'> } {
+  return is$typed(v, id, 'convoView')
 }
 
-export function validateConvoView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#convoView', v)
+export function validateConvoView(v: unknown) {
+  return lexicons.validate(`${id}#convoView`, v) as ValidationResult<ConvoView>
 }
 
 export interface LogBeginConvo {
@@ -141,16 +146,17 @@ export interface LogBeginConvo {
   [k: string]: unknown
 }
 
-export function isLogBeginConvo(v: unknown): v is LogBeginConvo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logBeginConvo'
-  )
+export function isLogBeginConvo(v: unknown): v is LogBeginConvo & {
+  $type: $Type<'chat.bsky.convo.defs', 'logBeginConvo'>
+} {
+  return is$typed(v, id, 'logBeginConvo')
 }
 
-export function validateLogBeginConvo(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logBeginConvo', v)
+export function validateLogBeginConvo(v: unknown) {
+  return lexicons.validate(
+    `${id}#logBeginConvo`,
+    v,
+  ) as ValidationResult<LogBeginConvo>
 }
 
 export interface LogLeaveConvo {
@@ -159,16 +165,17 @@ export interface LogLeaveConvo {
   [k: string]: unknown
 }
 
-export function isLogLeaveConvo(v: unknown): v is LogLeaveConvo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logLeaveConvo'
-  )
+export function isLogLeaveConvo(v: unknown): v is LogLeaveConvo & {
+  $type: $Type<'chat.bsky.convo.defs', 'logLeaveConvo'>
+} {
+  return is$typed(v, id, 'logLeaveConvo')
 }
 
-export function validateLogLeaveConvo(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logLeaveConvo', v)
+export function validateLogLeaveConvo(v: unknown) {
+  return lexicons.validate(
+    `${id}#logLeaveConvo`,
+    v,
+  ) as ValidationResult<LogLeaveConvo>
 }
 
 export interface LogCreateMessage {
@@ -181,16 +188,17 @@ export interface LogCreateMessage {
   [k: string]: unknown
 }
 
-export function isLogCreateMessage(v: unknown): v is LogCreateMessage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logCreateMessage'
-  )
+export function isLogCreateMessage(v: unknown): v is LogCreateMessage & {
+  $type: $Type<'chat.bsky.convo.defs', 'logCreateMessage'>
+} {
+  return is$typed(v, id, 'logCreateMessage')
 }
 
-export function validateLogCreateMessage(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logCreateMessage', v)
+export function validateLogCreateMessage(v: unknown) {
+  return lexicons.validate(
+    `${id}#logCreateMessage`,
+    v,
+  ) as ValidationResult<LogCreateMessage>
 }
 
 export interface LogDeleteMessage {
@@ -203,14 +211,15 @@ export interface LogDeleteMessage {
   [k: string]: unknown
 }
 
-export function isLogDeleteMessage(v: unknown): v is LogDeleteMessage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logDeleteMessage'
-  )
+export function isLogDeleteMessage(v: unknown): v is LogDeleteMessage & {
+  $type: $Type<'chat.bsky.convo.defs', 'logDeleteMessage'>
+} {
+  return is$typed(v, id, 'logDeleteMessage')
 }
 
-export function validateLogDeleteMessage(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logDeleteMessage', v)
+export function validateLogDeleteMessage(v: unknown) {
+  return lexicons.validate(
+    `${id}#logDeleteMessage`,
+    v,
+  ) as ValidationResult<LogDeleteMessage>
 }
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
index c05bc99b36a..4364c075ecd 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.deleteMessageForSelf'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvo.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvo.ts
index 1448c75b306..7563c777197 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvo.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvo.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.getConvo'
+
 export interface QueryParams {
   convoId: string
 }
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
index 108dfd6ad5b..d7a1a69bb13 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.getConvoForMembers'
+
 export interface QueryParams {
   members: string[]
 }
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/getLog.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/getLog.ts
index 89f6778c4d3..47f28623631 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/getLog.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/getLog.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.getLog'
+
 export interface QueryParams {
   cursor?: string
 }
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/getMessages.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/getMessages.ts
index a615ba37674..68f9331fdef 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/getMessages.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/getMessages.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.getMessages'
+
 export interface QueryParams {
   convoId: string
   limit: number
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/leaveConvo.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
index 8b76a7b0c75..67a3e3a141c 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'chat.bsky.convo.leaveConvo'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/listConvos.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/listConvos.ts
index 4d6f35bf39c..5829bd5b899 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/listConvos.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/listConvos.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.listConvos'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/muteConvo.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/muteConvo.ts
index ddb57623913..c12e1df0238 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/muteConvo.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/muteConvo.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.muteConvo'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessage.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessage.ts
index ab2d8b03f89..6ac463db74c 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessage.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessage.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.sendMessage'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
index b3c2c2bc252..bc5291bbcf3 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.sendMessageBatch'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -55,14 +57,12 @@ export interface BatchItem {
   [k: string]: unknown
 }
 
-export function isBatchItem(v: unknown): v is BatchItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.sendMessageBatch#batchItem'
-  )
+export function isBatchItem(v: unknown): v is BatchItem & {
+  $type: $Type<'chat.bsky.convo.sendMessageBatch', 'batchItem'>
+} {
+  return is$typed(v, id, 'batchItem')
 }
 
-export function validateBatchItem(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.sendMessageBatch#batchItem', v)
+export function validateBatchItem(v: unknown) {
+  return lexicons.validate(`${id}#batchItem`, v) as ValidationResult<BatchItem>
 }
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
index ddb57623913..03188d2bbd2 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.unmuteConvo'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/convo/updateRead.ts b/packages/bsky/src/lexicon/types/chat/bsky/convo/updateRead.ts
index b879cde82b0..8b7440714c0 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/convo/updateRead.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/convo/updateRead.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.updateRead'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts b/packages/bsky/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
index 077a0076bab..2fd8e512d18 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'chat.bsky.moderation.getActorMetadata'
+
 export interface QueryParams {
   actor: string
 }
@@ -54,14 +56,12 @@ export interface Metadata {
   [k: string]: unknown
 }
 
-export function isMetadata(v: unknown): v is Metadata {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.moderation.getActorMetadata#metadata'
-  )
+export function isMetadata(v: unknown): v is Metadata & {
+  $type: $Type<'chat.bsky.moderation.getActorMetadata', 'metadata'>
+} {
+  return is$typed(v, id, 'metadata')
 }
 
-export function validateMetadata(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.moderation.getActorMetadata#metadata', v)
+export function validateMetadata(v: unknown) {
+  return lexicons.validate(`${id}#metadata`, v) as ValidationResult<Metadata>
 }
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts b/packages/bsky/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
index 0a1f5b1b691..a24045586b0 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from '../convo/defs'
 
+const id = 'chat.bsky.moderation.getMessageContext'
+
 export interface QueryParams {
   /** Conversation that the message is from. NOTE: this field will eventually be required. */
   convoId?: string
diff --git a/packages/bsky/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts b/packages/bsky/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
index d9c95f69643..2493a8063be 100644
--- a/packages/bsky/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
+++ b/packages/bsky/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'chat.bsky.moderation.updateActorAccess'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/defs.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/defs.ts
index f58b7c7ece4..8b0e016c078 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/defs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/defs.ts
@@ -2,27 +2,30 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as ComAtprotoServerDefs from '../server/defs'
 
+const id = 'com.atproto.admin.defs'
+
 export interface StatusAttr {
   applied: boolean
   ref?: string
   [k: string]: unknown
 }
 
-export function isStatusAttr(v: unknown): v is StatusAttr {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#statusAttr'
-  )
+export function isStatusAttr(
+  v: unknown,
+): v is StatusAttr & { $type: $Type<'com.atproto.admin.defs', 'statusAttr'> } {
+  return is$typed(v, id, 'statusAttr')
 }
 
-export function validateStatusAttr(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#statusAttr', v)
+export function validateStatusAttr(v: unknown) {
+  return lexicons.validate(
+    `${id}#statusAttr`,
+    v,
+  ) as ValidationResult<StatusAttr>
 }
 
 export interface AccountView {
@@ -41,16 +44,17 @@ export interface AccountView {
   [k: string]: unknown
 }
 
-export function isAccountView(v: unknown): v is AccountView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#accountView'
-  )
+export function isAccountView(v: unknown): v is AccountView & {
+  $type: $Type<'com.atproto.admin.defs', 'accountView'>
+} {
+  return is$typed(v, id, 'accountView')
 }
 
-export function validateAccountView(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#accountView', v)
+export function validateAccountView(v: unknown) {
+  return lexicons.validate(
+    `${id}#accountView`,
+    v,
+  ) as ValidationResult<AccountView>
 }
 
 export interface RepoRef {
@@ -58,16 +62,14 @@ export interface RepoRef {
   [k: string]: unknown
 }
 
-export function isRepoRef(v: unknown): v is RepoRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#repoRef'
-  )
+export function isRepoRef(
+  v: unknown,
+): v is RepoRef & { $type: $Type<'com.atproto.admin.defs', 'repoRef'> } {
+  return is$typed(v, id, 'repoRef')
 }
 
-export function validateRepoRef(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#repoRef', v)
+export function validateRepoRef(v: unknown) {
+  return lexicons.validate(`${id}#repoRef`, v) as ValidationResult<RepoRef>
 }
 
 export interface RepoBlobRef {
@@ -77,16 +79,17 @@ export interface RepoBlobRef {
   [k: string]: unknown
 }
 
-export function isRepoBlobRef(v: unknown): v is RepoBlobRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#repoBlobRef'
-  )
+export function isRepoBlobRef(v: unknown): v is RepoBlobRef & {
+  $type: $Type<'com.atproto.admin.defs', 'repoBlobRef'>
+} {
+  return is$typed(v, id, 'repoBlobRef')
 }
 
-export function validateRepoBlobRef(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#repoBlobRef', v)
+export function validateRepoBlobRef(v: unknown) {
+  return lexicons.validate(
+    `${id}#repoBlobRef`,
+    v,
+  ) as ValidationResult<RepoBlobRef>
 }
 
 export interface ThreatSignature {
@@ -95,14 +98,15 @@ export interface ThreatSignature {
   [k: string]: unknown
 }
 
-export function isThreatSignature(v: unknown): v is ThreatSignature {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#threatSignature'
-  )
+export function isThreatSignature(v: unknown): v is ThreatSignature & {
+  $type: $Type<'com.atproto.admin.defs', 'threatSignature'>
+} {
+  return is$typed(v, id, 'threatSignature')
 }
 
-export function validateThreatSignature(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#threatSignature', v)
+export function validateThreatSignature(v: unknown) {
+  return lexicons.validate(
+    `${id}#threatSignature`,
+    v,
+  ) as ValidationResult<ThreatSignature>
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/deleteAccount.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/deleteAccount.ts
index 003c1b5ebcd..1acca2e1dab 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/deleteAccount.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/deleteAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.admin.deleteAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
index 68c6503d95e..d36f19ceb36 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.admin.disableAccountInvites'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
index 2bf8de35583..9a9db8e9659 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.admin.disableInviteCodes'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
index 3f2836e7142..a9e226a8e5d 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.admin.enableAccountInvites'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfo.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
index c7b840a153d..0cf60326ea3 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 
+const id = 'com.atproto.admin.getAccountInfo'
+
 export interface QueryParams {
   did: string
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfos.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
index 99ef44a99f5..fb5c83de25a 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 
+const id = 'com.atproto.admin.getAccountInfos'
+
 export interface QueryParams {
   dids: string[]
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/getInviteCodes.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
index d68b97d775a..80d9487ee8b 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoServerDefs from '../server/defs'
 
+const id = 'com.atproto.admin.getInviteCodes'
+
 export interface QueryParams {
   sort: 'recent' | 'usage' | (string & {})
   limit: number
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
index c13496638c8..21448f88d6b 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
@@ -3,13 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+const id = 'com.atproto.admin.getSubjectStatus'
+
 export interface QueryParams {
   did?: string
   uri?: string
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/searchAccounts.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/searchAccounts.ts
index 80d0eecd926..6a554d7c424 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/searchAccounts.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/searchAccounts.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 
+const id = 'com.atproto.admin.searchAccounts'
+
 export interface QueryParams {
   email?: string
   cursor?: string
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/sendEmail.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/sendEmail.ts
index 836fba39f79..baad3c1ee1f 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/sendEmail.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/sendEmail.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.admin.sendEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
index ebabffbccdb..e3aed0b58c9 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.admin.updateAccountEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
index d6dc4a2dc25..67c54a3b9de 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.admin.updateAccountHandle'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
index 948568f0d3d..c05879469c4 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.admin.updateAccountPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts b/packages/bsky/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
index c03d9667cae..e6630229fc0 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
@@ -3,13 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+const id = 'com.atproto.admin.updateSubjectStatus'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
index 5fa374de737..56ae83a87d4 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.identity.getRecommendedDidCredentials'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
index 82672f1d1c7..b687f9d01bc 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.identity.requestPlcOperationSignature'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/resolveHandle.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/resolveHandle.ts
index 05019df6166..c9e880b7cee 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/resolveHandle.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/resolveHandle.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.identity.resolveHandle'
+
 export interface QueryParams {
   /** The handle to resolve. */
   handle: string
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/signPlcOperation.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
index 3c908c049f2..c648e5b7ddf 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.identity.signPlcOperation'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
index 5290b55d023..3af1814148c 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.identity.submitPlcOperation'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/identity/updateHandle.ts b/packages/bsky/src/lexicon/types/com/atproto/identity/updateHandle.ts
index f451d1f57c7..c54d951e25d 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/identity/updateHandle.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/identity/updateHandle.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.identity.updateHandle'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/label/defs.ts b/packages/bsky/src/lexicon/types/com/atproto/label/defs.ts
index 348e985622b..8b0bc71b198 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/label/defs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/label/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'com.atproto.label.defs'
 
 /** Metadata tag on an atproto resource (eg, repo or record). */
 export interface Label {
@@ -29,16 +31,14 @@ export interface Label {
   [k: string]: unknown
 }
 
-export function isLabel(v: unknown): v is Label {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#label'
-  )
+export function isLabel(
+  v: unknown,
+): v is Label & { $type: $Type<'com.atproto.label.defs', 'label'> } {
+  return is$typed(v, id, 'label')
 }
 
-export function validateLabel(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#label', v)
+export function validateLabel(v: unknown) {
+  return lexicons.validate(`${id}#label`, v) as ValidationResult<Label>
 }
 
 /** Metadata tags on an atproto record, published by the author within the record. */
@@ -47,16 +47,17 @@ export interface SelfLabels {
   [k: string]: unknown
 }
 
-export function isSelfLabels(v: unknown): v is SelfLabels {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#selfLabels'
-  )
+export function isSelfLabels(
+  v: unknown,
+): v is SelfLabels & { $type: $Type<'com.atproto.label.defs', 'selfLabels'> } {
+  return is$typed(v, id, 'selfLabels')
 }
 
-export function validateSelfLabels(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#selfLabels', v)
+export function validateSelfLabels(v: unknown) {
+  return lexicons.validate(
+    `${id}#selfLabels`,
+    v,
+  ) as ValidationResult<SelfLabels>
 }
 
 /** Metadata tag on an atproto record, published by the author within the record. Note that schemas should use #selfLabels, not #selfLabel. */
@@ -66,16 +67,14 @@ export interface SelfLabel {
   [k: string]: unknown
 }
 
-export function isSelfLabel(v: unknown): v is SelfLabel {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#selfLabel'
-  )
+export function isSelfLabel(
+  v: unknown,
+): v is SelfLabel & { $type: $Type<'com.atproto.label.defs', 'selfLabel'> } {
+  return is$typed(v, id, 'selfLabel')
 }
 
-export function validateSelfLabel(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#selfLabel', v)
+export function validateSelfLabel(v: unknown) {
+  return lexicons.validate(`${id}#selfLabel`, v) as ValidationResult<SelfLabel>
 }
 
 /** Declares a label value and its expected interpretations and behaviors. */
@@ -94,16 +93,19 @@ export interface LabelValueDefinition {
   [k: string]: unknown
 }
 
-export function isLabelValueDefinition(v: unknown): v is LabelValueDefinition {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#labelValueDefinition'
-  )
+export function isLabelValueDefinition(
+  v: unknown,
+): v is LabelValueDefinition & {
+  $type: $Type<'com.atproto.label.defs', 'labelValueDefinition'>
+} {
+  return is$typed(v, id, 'labelValueDefinition')
 }
 
-export function validateLabelValueDefinition(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#labelValueDefinition', v)
+export function validateLabelValueDefinition(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelValueDefinition`,
+    v,
+  ) as ValidationResult<LabelValueDefinition>
 }
 
 /** Strings which describe the label in the UI, localized into a specific language. */
@@ -119,21 +121,17 @@ export interface LabelValueDefinitionStrings {
 
 export function isLabelValueDefinitionStrings(
   v: unknown,
-): v is LabelValueDefinitionStrings {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#labelValueDefinitionStrings'
-  )
+): v is LabelValueDefinitionStrings & {
+  $type: $Type<'com.atproto.label.defs', 'labelValueDefinitionStrings'>
+} {
+  return is$typed(v, id, 'labelValueDefinitionStrings')
 }
 
-export function validateLabelValueDefinitionStrings(
-  v: unknown,
-): ValidationResult {
+export function validateLabelValueDefinitionStrings(v: unknown) {
   return lexicons.validate(
-    'com.atproto.label.defs#labelValueDefinitionStrings',
+    `${id}#labelValueDefinitionStrings`,
     v,
-  )
+  ) as ValidationResult<LabelValueDefinitionStrings>
 }
 
 export type LabelValue =
diff --git a/packages/bsky/src/lexicon/types/com/atproto/label/queryLabels.ts b/packages/bsky/src/lexicon/types/com/atproto/label/queryLabels.ts
index 0c9d55a6961..62d114a2685 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/label/queryLabels.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/label/queryLabels.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoLabelDefs from './defs'
 
+const id = 'com.atproto.label.queryLabels'
+
 export interface QueryParams {
   /** List of AT URI patterns to match (boolean 'OR'). Each may be a prefix (ending with '*'; will match inclusive of the string leading to '*'), or a full URI. */
   uriPatterns: string[]
diff --git a/packages/bsky/src/lexicon/types/com/atproto/label/subscribeLabels.ts b/packages/bsky/src/lexicon/types/com/atproto/label/subscribeLabels.ts
index 6034b35d895..f84267b7075 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/label/subscribeLabels.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/label/subscribeLabels.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, ErrorFrame } from '@atproto/xrpc-server'
 import { IncomingMessage } from 'http'
 import * as ComAtprotoLabelDefs from './defs'
 
+const id = 'com.atproto.label.subscribeLabels'
+
 export interface QueryParams {
   /** The last known event seq number to backfill from. */
   cursor?: number
@@ -36,16 +38,14 @@ export interface Labels {
   [k: string]: unknown
 }
 
-export function isLabels(v: unknown): v is Labels {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.subscribeLabels#labels'
-  )
+export function isLabels(v: unknown): v is Labels & {
+  $type: $Type<'com.atproto.label.subscribeLabels', 'labels'>
+} {
+  return is$typed(v, id, 'labels')
 }
 
-export function validateLabels(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.subscribeLabels#labels', v)
+export function validateLabels(v: unknown) {
+  return lexicons.validate(`${id}#labels`, v) as ValidationResult<Labels>
 }
 
 export interface Info {
@@ -54,14 +54,12 @@ export interface Info {
   [k: string]: unknown
 }
 
-export function isInfo(v: unknown): v is Info {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.subscribeLabels#info'
-  )
+export function isInfo(
+  v: unknown,
+): v is Info & { $type: $Type<'com.atproto.label.subscribeLabels', 'info'> } {
+  return is$typed(v, id, 'info')
 }
 
-export function validateInfo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.subscribeLabels#info', v)
+export function validateInfo(v: unknown) {
+  return lexicons.validate(`${id}#info`, v) as ValidationResult<Info>
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/moderation/createReport.ts b/packages/bsky/src/lexicon/types/com/atproto/moderation/createReport.ts
index aa3f810a91c..5095d72d1fe 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/moderation/createReport.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/moderation/createReport.ts
@@ -3,14 +3,16 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoModerationDefs from './defs'
 import * as ComAtprotoAdminDefs from '../admin/defs'
 import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+const id = 'com.atproto.moderation.createReport'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/moderation/defs.ts b/packages/bsky/src/lexicon/types/com/atproto/moderation/defs.ts
index 08e555c2422..ed67a387dd5 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/moderation/defs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/moderation/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'com.atproto.moderation.defs'
 
 export type ReasonType =
   | 'com.atproto.moderation.defs#reasonSpam'
@@ -17,16 +19,16 @@ export type ReasonType =
   | (string & {})
 
 /** Spam: frequent unwanted promotion, replies, mentions */
-export const REASONSPAM = 'com.atproto.moderation.defs#reasonSpam'
+export const REASONSPAM = `${id}#reasonSpam`
 /** Direct violation of server rules, laws, terms of service */
-export const REASONVIOLATION = 'com.atproto.moderation.defs#reasonViolation'
+export const REASONVIOLATION = `${id}#reasonViolation`
 /** Misleading identity, affiliation, or content */
-export const REASONMISLEADING = 'com.atproto.moderation.defs#reasonMisleading'
+export const REASONMISLEADING = `${id}#reasonMisleading`
 /** Unwanted or mislabeled sexual content */
-export const REASONSEXUAL = 'com.atproto.moderation.defs#reasonSexual'
+export const REASONSEXUAL = `${id}#reasonSexual`
 /** Rude, harassing, explicit, or otherwise unwelcoming behavior */
-export const REASONRUDE = 'com.atproto.moderation.defs#reasonRude'
+export const REASONRUDE = `${id}#reasonRude`
 /** Other: reports not falling under another report category */
-export const REASONOTHER = 'com.atproto.moderation.defs#reasonOther'
+export const REASONOTHER = `${id}#reasonOther`
 /** Appeal: appeal a previously taken moderation action */
-export const REASONAPPEAL = 'com.atproto.moderation.defs#reasonAppeal'
+export const REASONAPPEAL = `${id}#reasonAppeal`
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/applyWrites.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/applyWrites.ts
index 4e3c8dcef3d..9e171a111c5 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/applyWrites.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/applyWrites.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoRepoDefs from './defs'
 
+const id = 'com.atproto.repo.applyWrites'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -65,16 +67,14 @@ export interface Create {
   [k: string]: unknown
 }
 
-export function isCreate(v: unknown): v is Create {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#create'
-  )
+export function isCreate(
+  v: unknown,
+): v is Create & { $type: $Type<'com.atproto.repo.applyWrites', 'create'> } {
+  return is$typed(v, id, 'create')
 }
 
-export function validateCreate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#create', v)
+export function validateCreate(v: unknown) {
+  return lexicons.validate(`${id}#create`, v) as ValidationResult<Create>
 }
 
 /** Operation which updates an existing record. */
@@ -85,16 +85,14 @@ export interface Update {
   [k: string]: unknown
 }
 
-export function isUpdate(v: unknown): v is Update {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#update'
-  )
+export function isUpdate(
+  v: unknown,
+): v is Update & { $type: $Type<'com.atproto.repo.applyWrites', 'update'> } {
+  return is$typed(v, id, 'update')
 }
 
-export function validateUpdate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#update', v)
+export function validateUpdate(v: unknown) {
+  return lexicons.validate(`${id}#update`, v) as ValidationResult<Update>
 }
 
 /** Operation which deletes an existing record. */
@@ -104,16 +102,14 @@ export interface Delete {
   [k: string]: unknown
 }
 
-export function isDelete(v: unknown): v is Delete {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#delete'
-  )
+export function isDelete(
+  v: unknown,
+): v is Delete & { $type: $Type<'com.atproto.repo.applyWrites', 'delete'> } {
+  return is$typed(v, id, 'delete')
 }
 
-export function validateDelete(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#delete', v)
+export function validateDelete(v: unknown) {
+  return lexicons.validate(`${id}#delete`, v) as ValidationResult<Delete>
 }
 
 export interface CreateResult {
@@ -123,16 +119,17 @@ export interface CreateResult {
   [k: string]: unknown
 }
 
-export function isCreateResult(v: unknown): v is CreateResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#createResult'
-  )
+export function isCreateResult(v: unknown): v is CreateResult & {
+  $type: $Type<'com.atproto.repo.applyWrites', 'createResult'>
+} {
+  return is$typed(v, id, 'createResult')
 }
 
-export function validateCreateResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#createResult', v)
+export function validateCreateResult(v: unknown) {
+  return lexicons.validate(
+    `${id}#createResult`,
+    v,
+  ) as ValidationResult<CreateResult>
 }
 
 export interface UpdateResult {
@@ -142,30 +139,32 @@ export interface UpdateResult {
   [k: string]: unknown
 }
 
-export function isUpdateResult(v: unknown): v is UpdateResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#updateResult'
-  )
+export function isUpdateResult(v: unknown): v is UpdateResult & {
+  $type: $Type<'com.atproto.repo.applyWrites', 'updateResult'>
+} {
+  return is$typed(v, id, 'updateResult')
 }
 
-export function validateUpdateResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#updateResult', v)
+export function validateUpdateResult(v: unknown) {
+  return lexicons.validate(
+    `${id}#updateResult`,
+    v,
+  ) as ValidationResult<UpdateResult>
 }
 
 export interface DeleteResult {
   [k: string]: unknown
 }
 
-export function isDeleteResult(v: unknown): v is DeleteResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#deleteResult'
-  )
+export function isDeleteResult(v: unknown): v is DeleteResult & {
+  $type: $Type<'com.atproto.repo.applyWrites', 'deleteResult'>
+} {
+  return is$typed(v, id, 'deleteResult')
 }
 
-export function validateDeleteResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#deleteResult', v)
+export function validateDeleteResult(v: unknown) {
+  return lexicons.validate(
+    `${id}#deleteResult`,
+    v,
+  ) as ValidationResult<DeleteResult>
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/createRecord.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/createRecord.ts
index 5cac0848bf1..b155d82b176 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/createRecord.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/createRecord.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoRepoDefs from './defs'
 
+const id = 'com.atproto.repo.createRecord'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/defs.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/defs.ts
index 8357fe2a611..eeb0b484b7e 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/defs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'com.atproto.repo.defs'
 
 export interface CommitMeta {
   cid: string
@@ -12,14 +14,15 @@ export interface CommitMeta {
   [k: string]: unknown
 }
 
-export function isCommitMeta(v: unknown): v is CommitMeta {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.defs#commitMeta'
-  )
+export function isCommitMeta(
+  v: unknown,
+): v is CommitMeta & { $type: $Type<'com.atproto.repo.defs', 'commitMeta'> } {
+  return is$typed(v, id, 'commitMeta')
 }
 
-export function validateCommitMeta(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.defs#commitMeta', v)
+export function validateCommitMeta(v: unknown) {
+  return lexicons.validate(
+    `${id}#commitMeta`,
+    v,
+  ) as ValidationResult<CommitMeta>
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/deleteRecord.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/deleteRecord.ts
index e594cd00adf..f285caa3e28 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/deleteRecord.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/deleteRecord.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoRepoDefs from './defs'
 
+const id = 'com.atproto.repo.deleteRecord'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/describeRepo.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/describeRepo.ts
index 749bedcfeb7..b3774866513 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/describeRepo.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/describeRepo.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.repo.describeRepo'
+
 export interface QueryParams {
   /** The handle or DID of the repo. */
   repo: string
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/getRecord.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/getRecord.ts
index 9d03da19530..ff0baecfadd 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/getRecord.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/getRecord.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.repo.getRecord'
+
 export interface QueryParams {
   /** The handle or DID of the repo. */
   repo: string
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/importRepo.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/importRepo.ts
index 59288c7a027..3dfc0334549 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/importRepo.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/importRepo.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.repo.importRepo'
+
 export interface QueryParams {}
 
 export type InputSchema = string | Uint8Array | Blob
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
index 40f4d385e47..e79f4d6a71e 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.repo.listMissingBlobs'
+
 export interface QueryParams {
   limit: number
   cursor?: string
@@ -52,14 +54,15 @@ export interface RecordBlob {
   [k: string]: unknown
 }
 
-export function isRecordBlob(v: unknown): v is RecordBlob {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.listMissingBlobs#recordBlob'
-  )
+export function isRecordBlob(v: unknown): v is RecordBlob & {
+  $type: $Type<'com.atproto.repo.listMissingBlobs', 'recordBlob'>
+} {
+  return is$typed(v, id, 'recordBlob')
 }
 
-export function validateRecordBlob(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.listMissingBlobs#recordBlob', v)
+export function validateRecordBlob(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordBlob`,
+    v,
+  ) as ValidationResult<RecordBlob>
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/listRecords.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/listRecords.ts
index f46f6eb0f7f..51b1393b9a8 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/listRecords.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/listRecords.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.repo.listRecords'
+
 export interface QueryParams {
   /** The handle or DID of the repo. */
   repo: string
@@ -64,14 +66,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.listRecords#record'
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'com.atproto.repo.listRecords', 'record'> } {
+  return is$typed(v, id, 'record')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.listRecords#record', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#record`, v) as ValidationResult<Record>
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/putRecord.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/putRecord.ts
index 5cde768d7c2..427fcd8920d 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/putRecord.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/putRecord.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoRepoDefs from './defs'
 
+const id = 'com.atproto.repo.putRecord'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/strongRef.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/strongRef.ts
index 8b21a6ddf81..a9298dcbe55 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/strongRef.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/strongRef.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'com.atproto.repo.strongRef'
 
 export interface Main {
   uri: string
@@ -12,15 +14,12 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'com.atproto.repo.strongRef#main' ||
-      v.$type === 'com.atproto.repo.strongRef')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: $Type<'com.atproto.repo.strongRef', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.strongRef#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/repo/uploadBlob.ts b/packages/bsky/src/lexicon/types/com/atproto/repo/uploadBlob.ts
index 4a712346a0b..7fc4618b664 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/repo/uploadBlob.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/repo/uploadBlob.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.repo.uploadBlob'
+
 export interface QueryParams {}
 
 export type InputSchema = string | Uint8Array | Blob
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/activateAccount.ts b/packages/bsky/src/lexicon/types/com/atproto/server/activateAccount.ts
index 82672f1d1c7..886a33d1e19 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/activateAccount.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/activateAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.activateAccount'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/checkAccountStatus.ts b/packages/bsky/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
index f17182a8dce..730ec6aca5b 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.checkAccountStatus'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/confirmEmail.ts b/packages/bsky/src/lexicon/types/com/atproto/server/confirmEmail.ts
index b667a04b996..f681b0a1e2f 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/confirmEmail.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/confirmEmail.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.confirmEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/createAccount.ts b/packages/bsky/src/lexicon/types/com/atproto/server/createAccount.ts
index 6e9b2f9f3c2..bd033e64df2 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/createAccount.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/createAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.createAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/createAppPassword.ts b/packages/bsky/src/lexicon/types/com/atproto/server/createAppPassword.ts
index 00657a2058f..98a4ce7f174 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/createAppPassword.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/createAppPassword.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.createAppPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -57,17 +59,15 @@ export interface AppPassword {
   [k: string]: unknown
 }
 
-export function isAppPassword(v: unknown): v is AppPassword {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.createAppPassword#appPassword'
-  )
+export function isAppPassword(v: unknown): v is AppPassword & {
+  $type: $Type<'com.atproto.server.createAppPassword', 'appPassword'>
+} {
+  return is$typed(v, id, 'appPassword')
 }
 
-export function validateAppPassword(v: unknown): ValidationResult {
+export function validateAppPassword(v: unknown) {
   return lexicons.validate(
-    'com.atproto.server.createAppPassword#appPassword',
+    `${id}#appPassword`,
     v,
-  )
+  ) as ValidationResult<AppPassword>
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCode.ts b/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCode.ts
index 9cfeacc7e28..27150f98e8a 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCode.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCode.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.createInviteCode'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCodes.ts b/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCodes.ts
index eb6cd2bb1b1..32719ec8d85 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCodes.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/createInviteCodes.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.createInviteCodes'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -56,17 +58,15 @@ export interface AccountCodes {
   [k: string]: unknown
 }
 
-export function isAccountCodes(v: unknown): v is AccountCodes {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.createInviteCodes#accountCodes'
-  )
+export function isAccountCodes(v: unknown): v is AccountCodes & {
+  $type: $Type<'com.atproto.server.createInviteCodes', 'accountCodes'>
+} {
+  return is$typed(v, id, 'accountCodes')
 }
 
-export function validateAccountCodes(v: unknown): ValidationResult {
+export function validateAccountCodes(v: unknown) {
   return lexicons.validate(
-    'com.atproto.server.createInviteCodes#accountCodes',
+    `${id}#accountCodes`,
     v,
-  )
+  ) as ValidationResult<AccountCodes>
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/createSession.ts b/packages/bsky/src/lexicon/types/com/atproto/server/createSession.ts
index 96f7d79d5bc..8d846520ae9 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/createSession.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/createSession.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.createSession'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/deactivateAccount.ts b/packages/bsky/src/lexicon/types/com/atproto/server/deactivateAccount.ts
index b3793d6b2e0..126255afd0d 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/deactivateAccount.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/deactivateAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.deactivateAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/defs.ts b/packages/bsky/src/lexicon/types/com/atproto/server/defs.ts
index 9bd67c9d7a5..e16c0153d90 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/defs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'com.atproto.server.defs'
 
 export interface InviteCode {
   code: string
@@ -17,16 +19,17 @@ export interface InviteCode {
   [k: string]: unknown
 }
 
-export function isInviteCode(v: unknown): v is InviteCode {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.defs#inviteCode'
-  )
+export function isInviteCode(
+  v: unknown,
+): v is InviteCode & { $type: $Type<'com.atproto.server.defs', 'inviteCode'> } {
+  return is$typed(v, id, 'inviteCode')
 }
 
-export function validateInviteCode(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.defs#inviteCode', v)
+export function validateInviteCode(v: unknown) {
+  return lexicons.validate(
+    `${id}#inviteCode`,
+    v,
+  ) as ValidationResult<InviteCode>
 }
 
 export interface InviteCodeUse {
@@ -35,14 +38,15 @@ export interface InviteCodeUse {
   [k: string]: unknown
 }
 
-export function isInviteCodeUse(v: unknown): v is InviteCodeUse {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.defs#inviteCodeUse'
-  )
+export function isInviteCodeUse(v: unknown): v is InviteCodeUse & {
+  $type: $Type<'com.atproto.server.defs', 'inviteCodeUse'>
+} {
+  return is$typed(v, id, 'inviteCodeUse')
 }
 
-export function validateInviteCodeUse(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.defs#inviteCodeUse', v)
+export function validateInviteCodeUse(v: unknown) {
+  return lexicons.validate(
+    `${id}#inviteCodeUse`,
+    v,
+  ) as ValidationResult<InviteCodeUse>
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/deleteAccount.ts b/packages/bsky/src/lexicon/types/com/atproto/server/deleteAccount.ts
index 4fcec360a11..e082e24ae10 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/deleteAccount.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/deleteAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.deleteAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/deleteSession.ts b/packages/bsky/src/lexicon/types/com/atproto/server/deleteSession.ts
index 82672f1d1c7..90c6882cf87 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/deleteSession.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/deleteSession.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.deleteSession'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/describeServer.ts b/packages/bsky/src/lexicon/types/com/atproto/server/describeServer.ts
index e21868158b3..0e4fc1fc242 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/describeServer.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/describeServer.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.describeServer'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -56,16 +58,14 @@ export interface Links {
   [k: string]: unknown
 }
 
-export function isLinks(v: unknown): v is Links {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.describeServer#links'
-  )
+export function isLinks(
+  v: unknown,
+): v is Links & { $type: $Type<'com.atproto.server.describeServer', 'links'> } {
+  return is$typed(v, id, 'links')
 }
 
-export function validateLinks(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.describeServer#links', v)
+export function validateLinks(v: unknown) {
+  return lexicons.validate(`${id}#links`, v) as ValidationResult<Links>
 }
 
 export interface Contact {
@@ -73,14 +73,12 @@ export interface Contact {
   [k: string]: unknown
 }
 
-export function isContact(v: unknown): v is Contact {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.describeServer#contact'
-  )
+export function isContact(v: unknown): v is Contact & {
+  $type: $Type<'com.atproto.server.describeServer', 'contact'>
+} {
+  return is$typed(v, id, 'contact')
 }
 
-export function validateContact(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.describeServer#contact', v)
+export function validateContact(v: unknown) {
+  return lexicons.validate(`${id}#contact`, v) as ValidationResult<Contact>
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts b/packages/bsky/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
index 82c3ffa8c31..9668cf1f1e6 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoServerDefs from './defs'
 
+const id = 'com.atproto.server.getAccountInviteCodes'
+
 export interface QueryParams {
   includeUsed: boolean
   /** Controls whether any new 'earned' but not 'created' invites should be created. */
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/getServiceAuth.ts b/packages/bsky/src/lexicon/types/com/atproto/server/getServiceAuth.ts
index 14f249fde44..54b3a3d4423 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/getServiceAuth.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/getServiceAuth.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.getServiceAuth'
+
 export interface QueryParams {
   /** The DID of the service that the token will be used to authenticate with */
   aud: string
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/getSession.ts b/packages/bsky/src/lexicon/types/com/atproto/server/getSession.ts
index be34cb92afd..e98c753d9d0 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/getSession.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/getSession.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.getSession'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/listAppPasswords.ts b/packages/bsky/src/lexicon/types/com/atproto/server/listAppPasswords.ts
index 397e7043e67..085637d4e51 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/listAppPasswords.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/listAppPasswords.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.listAppPasswords'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -50,14 +52,15 @@ export interface AppPassword {
   [k: string]: unknown
 }
 
-export function isAppPassword(v: unknown): v is AppPassword {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.listAppPasswords#appPassword'
-  )
+export function isAppPassword(v: unknown): v is AppPassword & {
+  $type: $Type<'com.atproto.server.listAppPasswords', 'appPassword'>
+} {
+  return is$typed(v, id, 'appPassword')
 }
 
-export function validateAppPassword(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.listAppPasswords#appPassword', v)
+export function validateAppPassword(v: unknown) {
+  return lexicons.validate(
+    `${id}#appPassword`,
+    v,
+  ) as ValidationResult<AppPassword>
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/refreshSession.ts b/packages/bsky/src/lexicon/types/com/atproto/server/refreshSession.ts
index 1d6272a0d71..de1b570bf1a 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/refreshSession.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/refreshSession.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.refreshSession'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/requestAccountDelete.ts b/packages/bsky/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
index 82672f1d1c7..85131190ec9 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.requestAccountDelete'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts b/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
index 82672f1d1c7..fb58814aeb4 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.requestEmailConfirmation'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts b/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
index 24dce3e12af..919e704328a 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.requestEmailUpdate'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/requestPasswordReset.ts b/packages/bsky/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
index d0f3f2ad769..f9bcec52a1f 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.requestPasswordReset'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/reserveSigningKey.ts b/packages/bsky/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
index 0ec1e80c77c..64dfb8c8414 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.reserveSigningKey'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/resetPassword.ts b/packages/bsky/src/lexicon/types/com/atproto/server/resetPassword.ts
index 38f63382cf0..d842e7e266d 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/resetPassword.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/resetPassword.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.resetPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/revokeAppPassword.ts b/packages/bsky/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
index 769ad6aa521..92a8204560e 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.revokeAppPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/server/updateEmail.ts b/packages/bsky/src/lexicon/types/com/atproto/server/updateEmail.ts
index 34fc7421979..4381078a0a6 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/server/updateEmail.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/server/updateEmail.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.updateEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getBlob.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getBlob.ts
index b1581d6e473..d42913abd01 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getBlob.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getBlob.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.getBlob'
+
 export interface QueryParams {
   /** The DID of the account. */
   did: string
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getBlocks.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getBlocks.ts
index 925b4a7d50b..a7dc7e73000 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getBlocks.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getBlocks.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.getBlocks'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getCheckout.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getCheckout.ts
index 51856b9088d..53d5b4bf39b 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getCheckout.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getCheckout.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.getCheckout'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getHead.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getHead.ts
index adedd4cf211..1adceb80d8a 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getHead.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getHead.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.getHead'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getLatestCommit.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
index f0e9a757d04..290c02e15fa 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.getLatestCommit'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getRecord.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getRecord.ts
index 83d88655228..8f03eb23951 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getRecord.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getRecord.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.getRecord'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getRepo.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getRepo.ts
index 883ff37def1..9cde9a4e01b 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getRepo.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getRepo.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.getRepo'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/getRepoStatus.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
index 00abbeaa84b..414e67e7a67 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.getRepoStatus'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/listBlobs.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/listBlobs.ts
index c6ea955ee0c..58fea9c1282 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/listBlobs.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/listBlobs.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.listBlobs'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/listRepos.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/listRepos.ts
index 5628b0b5147..468977d448c 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/listRepos.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/listRepos.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.listRepos'
+
 export interface QueryParams {
   limit: number
   cursor?: string
@@ -57,14 +59,12 @@ export interface Repo {
   [k: string]: unknown
 }
 
-export function isRepo(v: unknown): v is Repo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.listRepos#repo'
-  )
+export function isRepo(
+  v: unknown,
+): v is Repo & { $type: $Type<'com.atproto.sync.listRepos', 'repo'> } {
+  return is$typed(v, id, 'repo')
 }
 
-export function validateRepo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.listRepos#repo', v)
+export function validateRepo(v: unknown) {
+  return lexicons.validate(`${id}#repo`, v) as ValidationResult<Repo>
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
index 8a0af577c7c..8fd62afe59e 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.notifyOfUpdate'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/requestCrawl.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/requestCrawl.ts
index 31180aabf58..5148b8c5f24 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/requestCrawl.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/requestCrawl.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.requestCrawl'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/subscribeRepos.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
index 8f9855a5da4..b986110ccbe 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, ErrorFrame } from '@atproto/xrpc-server'
 import { IncomingMessage } from 'http'
 
+const id = 'com.atproto.sync.subscribeRepos'
+
 export interface QueryParams {
   /** The last known event seq number to backfill from. */
   cursor?: number
@@ -61,16 +63,14 @@ export interface Commit {
   [k: string]: unknown
 }
 
-export function isCommit(v: unknown): v is Commit {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#commit'
-  )
+export function isCommit(
+  v: unknown,
+): v is Commit & { $type: $Type<'com.atproto.sync.subscribeRepos', 'commit'> } {
+  return is$typed(v, id, 'commit')
 }
 
-export function validateCommit(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#commit', v)
+export function validateCommit(v: unknown) {
+  return lexicons.validate(`${id}#commit`, v) as ValidationResult<Commit>
 }
 
 /** Represents a change to an account's identity. Could be an updated handle, signing key, or pds hosting endpoint. Serves as a prod to all downstream services to refresh their identity cache. */
@@ -83,16 +83,14 @@ export interface Identity {
   [k: string]: unknown
 }
 
-export function isIdentity(v: unknown): v is Identity {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#identity'
-  )
+export function isIdentity(v: unknown): v is Identity & {
+  $type: $Type<'com.atproto.sync.subscribeRepos', 'identity'>
+} {
+  return is$typed(v, id, 'identity')
 }
 
-export function validateIdentity(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#identity', v)
+export function validateIdentity(v: unknown) {
+  return lexicons.validate(`${id}#identity`, v) as ValidationResult<Identity>
 }
 
 /** Represents a change to an account's status on a host (eg, PDS or Relay). The semantics of this event are that the status is at the host which emitted the event, not necessarily that at the currently active PDS. Eg, a Relay takedown would emit a takedown with active=false, even if the PDS is still active. */
@@ -107,16 +105,14 @@ export interface Account {
   [k: string]: unknown
 }
 
-export function isAccount(v: unknown): v is Account {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#account'
-  )
+export function isAccount(v: unknown): v is Account & {
+  $type: $Type<'com.atproto.sync.subscribeRepos', 'account'>
+} {
+  return is$typed(v, id, 'account')
 }
 
-export function validateAccount(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#account', v)
+export function validateAccount(v: unknown) {
+  return lexicons.validate(`${id}#account`, v) as ValidationResult<Account>
 }
 
 /** DEPRECATED -- Use #identity event instead */
@@ -128,16 +124,14 @@ export interface Handle {
   [k: string]: unknown
 }
 
-export function isHandle(v: unknown): v is Handle {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#handle'
-  )
+export function isHandle(
+  v: unknown,
+): v is Handle & { $type: $Type<'com.atproto.sync.subscribeRepos', 'handle'> } {
+  return is$typed(v, id, 'handle')
 }
 
-export function validateHandle(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#handle', v)
+export function validateHandle(v: unknown) {
+  return lexicons.validate(`${id}#handle`, v) as ValidationResult<Handle>
 }
 
 /** DEPRECATED -- Use #account event instead */
@@ -149,16 +143,14 @@ export interface Migrate {
   [k: string]: unknown
 }
 
-export function isMigrate(v: unknown): v is Migrate {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#migrate'
-  )
+export function isMigrate(v: unknown): v is Migrate & {
+  $type: $Type<'com.atproto.sync.subscribeRepos', 'migrate'>
+} {
+  return is$typed(v, id, 'migrate')
 }
 
-export function validateMigrate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#migrate', v)
+export function validateMigrate(v: unknown) {
+  return lexicons.validate(`${id}#migrate`, v) as ValidationResult<Migrate>
 }
 
 /** DEPRECATED -- Use #account event instead */
@@ -169,16 +161,14 @@ export interface Tombstone {
   [k: string]: unknown
 }
 
-export function isTombstone(v: unknown): v is Tombstone {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#tombstone'
-  )
+export function isTombstone(v: unknown): v is Tombstone & {
+  $type: $Type<'com.atproto.sync.subscribeRepos', 'tombstone'>
+} {
+  return is$typed(v, id, 'tombstone')
 }
 
-export function validateTombstone(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#tombstone', v)
+export function validateTombstone(v: unknown) {
+  return lexicons.validate(`${id}#tombstone`, v) as ValidationResult<Tombstone>
 }
 
 export interface Info {
@@ -187,16 +177,14 @@ export interface Info {
   [k: string]: unknown
 }
 
-export function isInfo(v: unknown): v is Info {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#info'
-  )
+export function isInfo(
+  v: unknown,
+): v is Info & { $type: $Type<'com.atproto.sync.subscribeRepos', 'info'> } {
+  return is$typed(v, id, 'info')
 }
 
-export function validateInfo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#info', v)
+export function validateInfo(v: unknown) {
+  return lexicons.validate(`${id}#info`, v) as ValidationResult<Info>
 }
 
 /** A repo operation, ie a mutation of a single record. */
@@ -208,14 +196,12 @@ export interface RepoOp {
   [k: string]: unknown
 }
 
-export function isRepoOp(v: unknown): v is RepoOp {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#repoOp'
-  )
+export function isRepoOp(
+  v: unknown,
+): v is RepoOp & { $type: $Type<'com.atproto.sync.subscribeRepos', 'repoOp'> } {
+  return is$typed(v, id, 'repoOp')
 }
 
-export function validateRepoOp(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#repoOp', v)
+export function validateRepoOp(v: unknown) {
+  return lexicons.validate(`${id}#repoOp`, v) as ValidationResult<RepoOp>
 }
diff --git a/packages/bsky/src/lexicon/types/com/atproto/temp/addReservedHandle.ts b/packages/bsky/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
index b884cb08998..374ab85c589 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.temp.addReservedHandle'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts b/packages/bsky/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
index 9486bce2b2b..948068c5a6d 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.temp.checkSignupQueue'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/bsky/src/lexicon/types/com/atproto/temp/fetchLabels.ts b/packages/bsky/src/lexicon/types/com/atproto/temp/fetchLabels.ts
index 0fbdeed1196..c8741a1331b 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/temp/fetchLabels.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/temp/fetchLabels.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoLabelDefs from '../label/defs'
 
+const id = 'com.atproto.temp.fetchLabels'
+
 export interface QueryParams {
   since?: number
   limit: number
diff --git a/packages/bsky/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts b/packages/bsky/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
index c977500fc33..556fe779d21 100644
--- a/packages/bsky/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
+++ b/packages/bsky/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.temp.requestPhoneVerification'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/bsky/src/lexicon/util.ts b/packages/bsky/src/lexicon/util.ts
index d7e70440d6e..a8b8cc9e0b7 100644
--- a/packages/bsky/src/lexicon/util.ts
+++ b/packages/bsky/src/lexicon/util.ts
@@ -1,13 +1,39 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-export function isObj(v: unknown): v is Record<string, unknown> {
-  return typeof v === 'object' && v !== null
+export type $Typed<V> = V & { $type: string }
+
+export type $Type<Id extends string, Hash extends string> = Hash extends 'main'
+  ? Id | `${Id}#${Hash}`
+  : `${Id}#${Hash}`
+
+function has$type<V>(v: V): v is $Typed<V & object> {
+  return (
+    v != null &&
+    typeof v === 'object' &&
+    '$type' in v &&
+    typeof v.$type === 'string'
+  )
+}
+
+function check$type<Id extends string, Hash extends string>(
+  $type: string,
+  id: Id,
+  hash: Hash,
+): $type is $Type<Id, Hash> {
+  return $type === id
+    ? hash === 'main'
+    : // $type === `${id}#${hash}`
+      $type.length === id.length + 1 + hash.length &&
+        $type.charCodeAt(id.length) === 35 /* '#' */ &&
+        $type.startsWith(id) &&
+        $type.endsWith(hash)
 }
 
-export function hasProp<K extends PropertyKey>(
-  data: object,
-  prop: K,
-): data is Record<K, unknown> {
-  return prop in data
+export function is$typed<V, Id extends string, Hash extends string>(
+  v: V,
+  id: Id,
+  hash: Hash,
+): v is V & object & { $type: $Type<Id, Hash> } {
+  return has$type(v) && check$type(v.$type, id, hash)
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/defs.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/defs.ts
index d1ad4f980c2..8f8e17ba184 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/defs.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as AppBskyGraphDefs from '../graph/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const id = 'app.bsky.actor.defs'
+
 export interface ProfileViewBasic {
   did: string
   handle: string
@@ -21,16 +23,17 @@ export interface ProfileViewBasic {
   [k: string]: unknown
 }
 
-export function isProfileViewBasic(v: unknown): v is ProfileViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileViewBasic'
-  )
+export function isProfileViewBasic(v: unknown): v is ProfileViewBasic & {
+  $type: $Type<'app.bsky.actor.defs', 'profileViewBasic'>
+} {
+  return is$typed(v, id, 'profileViewBasic')
 }
 
-export function validateProfileViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileViewBasic', v)
+export function validateProfileViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileViewBasic`,
+    v,
+  ) as ValidationResult<ProfileViewBasic>
 }
 
 export interface ProfileView {
@@ -47,16 +50,17 @@ export interface ProfileView {
   [k: string]: unknown
 }
 
-export function isProfileView(v: unknown): v is ProfileView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileView'
-  )
+export function isProfileView(
+  v: unknown,
+): v is ProfileView & { $type: $Type<'app.bsky.actor.defs', 'profileView'> } {
+  return is$typed(v, id, 'profileView')
 }
 
-export function validateProfileView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileView', v)
+export function validateProfileView(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileView`,
+    v,
+  ) as ValidationResult<ProfileView>
 }
 
 export interface ProfileViewDetailed {
@@ -79,16 +83,17 @@ export interface ProfileViewDetailed {
   [k: string]: unknown
 }
 
-export function isProfileViewDetailed(v: unknown): v is ProfileViewDetailed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileViewDetailed'
-  )
+export function isProfileViewDetailed(v: unknown): v is ProfileViewDetailed & {
+  $type: $Type<'app.bsky.actor.defs', 'profileViewDetailed'>
+} {
+  return is$typed(v, id, 'profileViewDetailed')
 }
 
-export function validateProfileViewDetailed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileViewDetailed', v)
+export function validateProfileViewDetailed(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileViewDetailed`,
+    v,
+  ) as ValidationResult<ProfileViewDetailed>
 }
 
 export interface ProfileAssociated {
@@ -100,16 +105,17 @@ export interface ProfileAssociated {
   [k: string]: unknown
 }
 
-export function isProfileAssociated(v: unknown): v is ProfileAssociated {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileAssociated'
-  )
+export function isProfileAssociated(v: unknown): v is ProfileAssociated & {
+  $type: $Type<'app.bsky.actor.defs', 'profileAssociated'>
+} {
+  return is$typed(v, id, 'profileAssociated')
 }
 
-export function validateProfileAssociated(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileAssociated', v)
+export function validateProfileAssociated(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileAssociated`,
+    v,
+  ) as ValidationResult<ProfileAssociated>
 }
 
 export interface ProfileAssociatedChat {
@@ -119,16 +125,17 @@ export interface ProfileAssociatedChat {
 
 export function isProfileAssociatedChat(
   v: unknown,
-): v is ProfileAssociatedChat {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileAssociatedChat'
-  )
+): v is ProfileAssociatedChat & {
+  $type: $Type<'app.bsky.actor.defs', 'profileAssociatedChat'>
+} {
+  return is$typed(v, id, 'profileAssociatedChat')
 }
 
-export function validateProfileAssociatedChat(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileAssociatedChat', v)
+export function validateProfileAssociatedChat(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileAssociatedChat`,
+    v,
+  ) as ValidationResult<ProfileAssociatedChat>
 }
 
 /** Metadata about the requesting account's relationship with the subject account. Only has meaningful content for authed requests. */
@@ -144,16 +151,17 @@ export interface ViewerState {
   [k: string]: unknown
 }
 
-export function isViewerState(v: unknown): v is ViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#viewerState'
-  )
+export function isViewerState(
+  v: unknown,
+): v is ViewerState & { $type: $Type<'app.bsky.actor.defs', 'viewerState'> } {
+  return is$typed(v, id, 'viewerState')
 }
 
-export function validateViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#viewerState', v)
+export function validateViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewerState`,
+    v,
+  ) as ValidationResult<ViewerState>
 }
 
 /** The subject's followers whom you also follow */
@@ -163,16 +171,17 @@ export interface KnownFollowers {
   [k: string]: unknown
 }
 
-export function isKnownFollowers(v: unknown): v is KnownFollowers {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#knownFollowers'
-  )
+export function isKnownFollowers(v: unknown): v is KnownFollowers & {
+  $type: $Type<'app.bsky.actor.defs', 'knownFollowers'>
+} {
+  return is$typed(v, id, 'knownFollowers')
 }
 
-export function validateKnownFollowers(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#knownFollowers', v)
+export function validateKnownFollowers(v: unknown) {
+  return lexicons.validate(
+    `${id}#knownFollowers`,
+    v,
+  ) as ValidationResult<KnownFollowers>
 }
 
 export type Preferences = (
@@ -196,16 +205,17 @@ export interface AdultContentPref {
   [k: string]: unknown
 }
 
-export function isAdultContentPref(v: unknown): v is AdultContentPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#adultContentPref'
-  )
+export function isAdultContentPref(v: unknown): v is AdultContentPref & {
+  $type: $Type<'app.bsky.actor.defs', 'adultContentPref'>
+} {
+  return is$typed(v, id, 'adultContentPref')
 }
 
-export function validateAdultContentPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#adultContentPref', v)
+export function validateAdultContentPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#adultContentPref`,
+    v,
+  ) as ValidationResult<AdultContentPref>
 }
 
 export interface ContentLabelPref {
@@ -216,16 +226,17 @@ export interface ContentLabelPref {
   [k: string]: unknown
 }
 
-export function isContentLabelPref(v: unknown): v is ContentLabelPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#contentLabelPref'
-  )
+export function isContentLabelPref(v: unknown): v is ContentLabelPref & {
+  $type: $Type<'app.bsky.actor.defs', 'contentLabelPref'>
+} {
+  return is$typed(v, id, 'contentLabelPref')
 }
 
-export function validateContentLabelPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#contentLabelPref', v)
+export function validateContentLabelPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#contentLabelPref`,
+    v,
+  ) as ValidationResult<ContentLabelPref>
 }
 
 export interface SavedFeed {
@@ -236,16 +247,14 @@ export interface SavedFeed {
   [k: string]: unknown
 }
 
-export function isSavedFeed(v: unknown): v is SavedFeed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeed'
-  )
+export function isSavedFeed(
+  v: unknown,
+): v is SavedFeed & { $type: $Type<'app.bsky.actor.defs', 'savedFeed'> } {
+  return is$typed(v, id, 'savedFeed')
 }
 
-export function validateSavedFeed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeed', v)
+export function validateSavedFeed(v: unknown) {
+  return lexicons.validate(`${id}#savedFeed`, v) as ValidationResult<SavedFeed>
 }
 
 export interface SavedFeedsPrefV2 {
@@ -253,16 +262,17 @@ export interface SavedFeedsPrefV2 {
   [k: string]: unknown
 }
 
-export function isSavedFeedsPrefV2(v: unknown): v is SavedFeedsPrefV2 {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeedsPrefV2'
-  )
+export function isSavedFeedsPrefV2(v: unknown): v is SavedFeedsPrefV2 & {
+  $type: $Type<'app.bsky.actor.defs', 'savedFeedsPrefV2'>
+} {
+  return is$typed(v, id, 'savedFeedsPrefV2')
 }
 
-export function validateSavedFeedsPrefV2(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeedsPrefV2', v)
+export function validateSavedFeedsPrefV2(v: unknown) {
+  return lexicons.validate(
+    `${id}#savedFeedsPrefV2`,
+    v,
+  ) as ValidationResult<SavedFeedsPrefV2>
 }
 
 export interface SavedFeedsPref {
@@ -272,16 +282,17 @@ export interface SavedFeedsPref {
   [k: string]: unknown
 }
 
-export function isSavedFeedsPref(v: unknown): v is SavedFeedsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeedsPref'
-  )
+export function isSavedFeedsPref(v: unknown): v is SavedFeedsPref & {
+  $type: $Type<'app.bsky.actor.defs', 'savedFeedsPref'>
+} {
+  return is$typed(v, id, 'savedFeedsPref')
 }
 
-export function validateSavedFeedsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeedsPref', v)
+export function validateSavedFeedsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#savedFeedsPref`,
+    v,
+  ) as ValidationResult<SavedFeedsPref>
 }
 
 export interface PersonalDetailsPref {
@@ -290,16 +301,17 @@ export interface PersonalDetailsPref {
   [k: string]: unknown
 }
 
-export function isPersonalDetailsPref(v: unknown): v is PersonalDetailsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#personalDetailsPref'
-  )
+export function isPersonalDetailsPref(v: unknown): v is PersonalDetailsPref & {
+  $type: $Type<'app.bsky.actor.defs', 'personalDetailsPref'>
+} {
+  return is$typed(v, id, 'personalDetailsPref')
 }
 
-export function validatePersonalDetailsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#personalDetailsPref', v)
+export function validatePersonalDetailsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#personalDetailsPref`,
+    v,
+  ) as ValidationResult<PersonalDetailsPref>
 }
 
 export interface FeedViewPref {
@@ -318,16 +330,17 @@ export interface FeedViewPref {
   [k: string]: unknown
 }
 
-export function isFeedViewPref(v: unknown): v is FeedViewPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#feedViewPref'
-  )
+export function isFeedViewPref(
+  v: unknown,
+): v is FeedViewPref & { $type: $Type<'app.bsky.actor.defs', 'feedViewPref'> } {
+  return is$typed(v, id, 'feedViewPref')
 }
 
-export function validateFeedViewPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#feedViewPref', v)
+export function validateFeedViewPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#feedViewPref`,
+    v,
+  ) as ValidationResult<FeedViewPref>
 }
 
 export interface ThreadViewPref {
@@ -344,16 +357,17 @@ export interface ThreadViewPref {
   [k: string]: unknown
 }
 
-export function isThreadViewPref(v: unknown): v is ThreadViewPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#threadViewPref'
-  )
+export function isThreadViewPref(v: unknown): v is ThreadViewPref & {
+  $type: $Type<'app.bsky.actor.defs', 'threadViewPref'>
+} {
+  return is$typed(v, id, 'threadViewPref')
 }
 
-export function validateThreadViewPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#threadViewPref', v)
+export function validateThreadViewPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#threadViewPref`,
+    v,
+  ) as ValidationResult<ThreadViewPref>
 }
 
 export interface InterestsPref {
@@ -362,16 +376,17 @@ export interface InterestsPref {
   [k: string]: unknown
 }
 
-export function isInterestsPref(v: unknown): v is InterestsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#interestsPref'
-  )
+export function isInterestsPref(v: unknown): v is InterestsPref & {
+  $type: $Type<'app.bsky.actor.defs', 'interestsPref'>
+} {
+  return is$typed(v, id, 'interestsPref')
 }
 
-export function validateInterestsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#interestsPref', v)
+export function validateInterestsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#interestsPref`,
+    v,
+  ) as ValidationResult<InterestsPref>
 }
 
 export type MutedWordTarget = 'content' | 'tag' | (string & {})
@@ -390,16 +405,14 @@ export interface MutedWord {
   [k: string]: unknown
 }
 
-export function isMutedWord(v: unknown): v is MutedWord {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#mutedWord'
-  )
+export function isMutedWord(
+  v: unknown,
+): v is MutedWord & { $type: $Type<'app.bsky.actor.defs', 'mutedWord'> } {
+  return is$typed(v, id, 'mutedWord')
 }
 
-export function validateMutedWord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#mutedWord', v)
+export function validateMutedWord(v: unknown) {
+  return lexicons.validate(`${id}#mutedWord`, v) as ValidationResult<MutedWord>
 }
 
 export interface MutedWordsPref {
@@ -408,16 +421,17 @@ export interface MutedWordsPref {
   [k: string]: unknown
 }
 
-export function isMutedWordsPref(v: unknown): v is MutedWordsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#mutedWordsPref'
-  )
+export function isMutedWordsPref(v: unknown): v is MutedWordsPref & {
+  $type: $Type<'app.bsky.actor.defs', 'mutedWordsPref'>
+} {
+  return is$typed(v, id, 'mutedWordsPref')
 }
 
-export function validateMutedWordsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#mutedWordsPref', v)
+export function validateMutedWordsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#mutedWordsPref`,
+    v,
+  ) as ValidationResult<MutedWordsPref>
 }
 
 export interface HiddenPostsPref {
@@ -426,16 +440,17 @@ export interface HiddenPostsPref {
   [k: string]: unknown
 }
 
-export function isHiddenPostsPref(v: unknown): v is HiddenPostsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#hiddenPostsPref'
-  )
+export function isHiddenPostsPref(v: unknown): v is HiddenPostsPref & {
+  $type: $Type<'app.bsky.actor.defs', 'hiddenPostsPref'>
+} {
+  return is$typed(v, id, 'hiddenPostsPref')
 }
 
-export function validateHiddenPostsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#hiddenPostsPref', v)
+export function validateHiddenPostsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#hiddenPostsPref`,
+    v,
+  ) as ValidationResult<HiddenPostsPref>
 }
 
 export interface LabelersPref {
@@ -443,16 +458,17 @@ export interface LabelersPref {
   [k: string]: unknown
 }
 
-export function isLabelersPref(v: unknown): v is LabelersPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#labelersPref'
-  )
+export function isLabelersPref(
+  v: unknown,
+): v is LabelersPref & { $type: $Type<'app.bsky.actor.defs', 'labelersPref'> } {
+  return is$typed(v, id, 'labelersPref')
 }
 
-export function validateLabelersPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#labelersPref', v)
+export function validateLabelersPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelersPref`,
+    v,
+  ) as ValidationResult<LabelersPref>
 }
 
 export interface LabelerPrefItem {
@@ -460,16 +476,17 @@ export interface LabelerPrefItem {
   [k: string]: unknown
 }
 
-export function isLabelerPrefItem(v: unknown): v is LabelerPrefItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#labelerPrefItem'
-  )
+export function isLabelerPrefItem(v: unknown): v is LabelerPrefItem & {
+  $type: $Type<'app.bsky.actor.defs', 'labelerPrefItem'>
+} {
+  return is$typed(v, id, 'labelerPrefItem')
 }
 
-export function validateLabelerPrefItem(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#labelerPrefItem', v)
+export function validateLabelerPrefItem(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerPrefItem`,
+    v,
+  ) as ValidationResult<LabelerPrefItem>
 }
 
 /** A grab bag of state that's specific to the bsky.app program. Third-party apps shouldn't use this. */
@@ -482,16 +499,17 @@ export interface BskyAppStatePref {
   [k: string]: unknown
 }
 
-export function isBskyAppStatePref(v: unknown): v is BskyAppStatePref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#bskyAppStatePref'
-  )
+export function isBskyAppStatePref(v: unknown): v is BskyAppStatePref & {
+  $type: $Type<'app.bsky.actor.defs', 'bskyAppStatePref'>
+} {
+  return is$typed(v, id, 'bskyAppStatePref')
 }
 
-export function validateBskyAppStatePref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#bskyAppStatePref', v)
+export function validateBskyAppStatePref(v: unknown) {
+  return lexicons.validate(
+    `${id}#bskyAppStatePref`,
+    v,
+  ) as ValidationResult<BskyAppStatePref>
 }
 
 /** If set, an active progress guide. Once completed, can be set to undefined. Should have unspecced fields tracking progress. */
@@ -500,16 +518,19 @@ export interface BskyAppProgressGuide {
   [k: string]: unknown
 }
 
-export function isBskyAppProgressGuide(v: unknown): v is BskyAppProgressGuide {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#bskyAppProgressGuide'
-  )
+export function isBskyAppProgressGuide(
+  v: unknown,
+): v is BskyAppProgressGuide & {
+  $type: $Type<'app.bsky.actor.defs', 'bskyAppProgressGuide'>
+} {
+  return is$typed(v, id, 'bskyAppProgressGuide')
 }
 
-export function validateBskyAppProgressGuide(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#bskyAppProgressGuide', v)
+export function validateBskyAppProgressGuide(v: unknown) {
+  return lexicons.validate(
+    `${id}#bskyAppProgressGuide`,
+    v,
+  ) as ValidationResult<BskyAppProgressGuide>
 }
 
 /** A new user experiences (NUX) storage object */
@@ -523,12 +544,12 @@ export interface Nux {
   [k: string]: unknown
 }
 
-export function isNux(v: unknown): v is Nux {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.actor.defs#nux'
-  )
+export function isNux(
+  v: unknown,
+): v is Nux & { $type: $Type<'app.bsky.actor.defs', 'nux'> } {
+  return is$typed(v, id, 'nux')
 }
 
-export function validateNux(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#nux', v)
+export function validateNux(v: unknown) {
+  return lexicons.validate(`${id}#nux`, v) as ValidationResult<Nux>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/getPreferences.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/getPreferences.ts
index 305e80484be..680cdd0967d 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/getPreferences.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/getPreferences.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+const id = 'app.bsky.actor.getPreferences'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/getProfile.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/getProfile.ts
index 5a7b1f25bfc..2ce818e78d1 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/getProfile.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/getProfile.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+const id = 'app.bsky.actor.getProfile'
+
 export interface QueryParams {
   /** Handle or DID of account to fetch profile of. */
   actor: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/getProfiles.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/getProfiles.ts
index 16438505654..354d8677cc1 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/getProfiles.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/getProfiles.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+const id = 'app.bsky.actor.getProfiles'
+
 export interface QueryParams {
   actors: string[]
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/getSuggestions.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/getSuggestions.ts
index 33b89a18bfa..1690000cb13 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/getSuggestions.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/getSuggestions.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+const id = 'app.bsky.actor.getSuggestions'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/profile.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/profile.ts
index 617bdf2cd73..9c71f43c191 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/profile.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/profile.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const id = 'app.bsky.actor.profile'
+
 export interface Record {
   displayName?: string
   /** Free-form profile description text. */
@@ -25,15 +27,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.actor.profile#main' ||
-      v.$type === 'app.bsky.actor.profile')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.actor.profile', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.profile#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/putPreferences.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/putPreferences.ts
index 670e752fea3..ecedca7927f 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/putPreferences.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/putPreferences.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+const id = 'app.bsky.actor.putPreferences'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/searchActors.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/searchActors.ts
index dcda0c41854..5b788366ee5 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/searchActors.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/searchActors.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+const id = 'app.bsky.actor.searchActors'
+
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead. */
   term?: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
index 0198b23d790..754e2e8db17 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+const id = 'app.bsky.actor.searchActorsTypeahead'
+
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead. */
   term?: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/embed/defs.ts b/packages/ozone/src/lexicon/types/app/bsky/embed/defs.ts
index cc253f9e610..299c6f4e414 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/embed/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/embed/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.embed.defs'
 
 /** width:height represents an aspect ratio. It may be approximate, and may not correspond to absolute dimensions in any given unit. */
 export interface AspectRatio {
@@ -13,14 +15,15 @@ export interface AspectRatio {
   [k: string]: unknown
 }
 
-export function isAspectRatio(v: unknown): v is AspectRatio {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.defs#aspectRatio'
-  )
+export function isAspectRatio(
+  v: unknown,
+): v is AspectRatio & { $type: $Type<'app.bsky.embed.defs', 'aspectRatio'> } {
+  return is$typed(v, id, 'aspectRatio')
 }
 
-export function validateAspectRatio(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.defs#aspectRatio', v)
+export function validateAspectRatio(v: unknown) {
+  return lexicons.validate(
+    `${id}#aspectRatio`,
+    v,
+  ) as ValidationResult<AspectRatio>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/embed/external.ts b/packages/ozone/src/lexicon/types/app/bsky/embed/external.ts
index b137ee4b6f5..205bc5280c9 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/embed/external.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/embed/external.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.embed.external'
 
 /** A representation of some externally linked content (eg, a URL and 'card'), embedded in a Bluesky record (eg, a post). */
 export interface Main {
@@ -12,17 +14,14 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.external#main' ||
-      v.$type === 'app.bsky.embed.external')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: $Type<'app.bsky.embed.external', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface External {
@@ -33,16 +32,14 @@ export interface External {
   [k: string]: unknown
 }
 
-export function isExternal(v: unknown): v is External {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#external'
-  )
+export function isExternal(
+  v: unknown,
+): v is External & { $type: $Type<'app.bsky.embed.external', 'external'> } {
+  return is$typed(v, id, 'external')
 }
 
-export function validateExternal(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#external', v)
+export function validateExternal(v: unknown) {
+  return lexicons.validate(`${id}#external`, v) as ValidationResult<External>
 }
 
 export interface View {
@@ -50,16 +47,14 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: $Type<'app.bsky.embed.external', 'view'> } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
 
 export interface ViewExternal {
@@ -70,14 +65,15 @@ export interface ViewExternal {
   [k: string]: unknown
 }
 
-export function isViewExternal(v: unknown): v is ViewExternal {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#viewExternal'
-  )
+export function isViewExternal(v: unknown): v is ViewExternal & {
+  $type: $Type<'app.bsky.embed.external', 'viewExternal'>
+} {
+  return is$typed(v, id, 'viewExternal')
 }
 
-export function validateViewExternal(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#viewExternal', v)
+export function validateViewExternal(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewExternal`,
+    v,
+  ) as ValidationResult<ViewExternal>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/embed/images.ts b/packages/ozone/src/lexicon/types/app/bsky/embed/images.ts
index 1fddf42f8eb..0fd622ba6c2 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/embed/images.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/embed/images.ts
@@ -2,27 +2,26 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyEmbedDefs from './defs'
 
+const id = 'app.bsky.embed.images'
+
 export interface Main {
   images: Image[]
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.images#main' ||
-      v.$type === 'app.bsky.embed.images')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: $Type<'app.bsky.embed.images', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface Image {
@@ -33,14 +32,14 @@ export interface Image {
   [k: string]: unknown
 }
 
-export function isImage(v: unknown): v is Image {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.images#image'
-  )
+export function isImage(
+  v: unknown,
+): v is Image & { $type: $Type<'app.bsky.embed.images', 'image'> } {
+  return is$typed(v, id, 'image')
 }
 
-export function validateImage(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#image', v)
+export function validateImage(v: unknown) {
+  return lexicons.validate(`${id}#image`, v) as ValidationResult<Image>
 }
 
 export interface View {
@@ -48,14 +47,14 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.images#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: $Type<'app.bsky.embed.images', 'view'> } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
 
 export interface ViewImage {
@@ -69,14 +68,12 @@ export interface ViewImage {
   [k: string]: unknown
 }
 
-export function isViewImage(v: unknown): v is ViewImage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.images#viewImage'
-  )
+export function isViewImage(
+  v: unknown,
+): v is ViewImage & { $type: $Type<'app.bsky.embed.images', 'viewImage'> } {
+  return is$typed(v, id, 'viewImage')
 }
 
-export function validateViewImage(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#viewImage', v)
+export function validateViewImage(v: unknown) {
+  return lexicons.validate(`${id}#viewImage`, v) as ValidationResult<ViewImage>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/embed/record.ts b/packages/ozone/src/lexicon/types/app/bsky/embed/record.ts
index 452c8fb7f71..d296b291fb8 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/embed/record.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/embed/record.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 import * as AppBskyFeedDefs from '../feed/defs'
 import * as AppBskyGraphDefs from '../graph/defs'
@@ -16,22 +16,21 @@ import * as AppBskyEmbedVideo from './video'
 import * as AppBskyEmbedExternal from './external'
 import * as AppBskyEmbedRecordWithMedia from './recordWithMedia'
 
+const id = 'app.bsky.embed.record'
+
 export interface Main {
   record: ComAtprotoRepoStrongRef.Main
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.record#main' ||
-      v.$type === 'app.bsky.embed.record')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: $Type<'app.bsky.embed.record', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface View {
@@ -48,14 +47,14 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.record#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: $Type<'app.bsky.embed.record', 'view'> } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
 
 export interface ViewRecord {
@@ -81,16 +80,17 @@ export interface ViewRecord {
   [k: string]: unknown
 }
 
-export function isViewRecord(v: unknown): v is ViewRecord {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewRecord'
-  )
+export function isViewRecord(
+  v: unknown,
+): v is ViewRecord & { $type: $Type<'app.bsky.embed.record', 'viewRecord'> } {
+  return is$typed(v, id, 'viewRecord')
 }
 
-export function validateViewRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewRecord', v)
+export function validateViewRecord(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewRecord`,
+    v,
+  ) as ValidationResult<ViewRecord>
 }
 
 export interface ViewNotFound {
@@ -99,16 +99,17 @@ export interface ViewNotFound {
   [k: string]: unknown
 }
 
-export function isViewNotFound(v: unknown): v is ViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewNotFound'
-  )
+export function isViewNotFound(v: unknown): v is ViewNotFound & {
+  $type: $Type<'app.bsky.embed.record', 'viewNotFound'>
+} {
+  return is$typed(v, id, 'viewNotFound')
 }
 
-export function validateViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewNotFound', v)
+export function validateViewNotFound(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewNotFound`,
+    v,
+  ) as ValidationResult<ViewNotFound>
 }
 
 export interface ViewBlocked {
@@ -118,16 +119,17 @@ export interface ViewBlocked {
   [k: string]: unknown
 }
 
-export function isViewBlocked(v: unknown): v is ViewBlocked {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewBlocked'
-  )
+export function isViewBlocked(
+  v: unknown,
+): v is ViewBlocked & { $type: $Type<'app.bsky.embed.record', 'viewBlocked'> } {
+  return is$typed(v, id, 'viewBlocked')
 }
 
-export function validateViewBlocked(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewBlocked', v)
+export function validateViewBlocked(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewBlocked`,
+    v,
+  ) as ValidationResult<ViewBlocked>
 }
 
 export interface ViewDetached {
@@ -136,14 +138,15 @@ export interface ViewDetached {
   [k: string]: unknown
 }
 
-export function isViewDetached(v: unknown): v is ViewDetached {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewDetached'
-  )
+export function isViewDetached(v: unknown): v is ViewDetached & {
+  $type: $Type<'app.bsky.embed.record', 'viewDetached'>
+} {
+  return is$typed(v, id, 'viewDetached')
 }
 
-export function validateViewDetached(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewDetached', v)
+export function validateViewDetached(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewDetached`,
+    v,
+  ) as ValidationResult<ViewDetached>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/embed/recordWithMedia.ts b/packages/ozone/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
index 4df0ee5c2d7..9af46777257 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
@@ -2,14 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyEmbedRecord from './record'
 import * as AppBskyEmbedImages from './images'
 import * as AppBskyEmbedVideo from './video'
 import * as AppBskyEmbedExternal from './external'
 
+const id = 'app.bsky.embed.recordWithMedia'
+
 export interface Main {
   record: AppBskyEmbedRecord.Main
   media:
@@ -20,17 +22,14 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.recordWithMedia#main' ||
-      v.$type === 'app.bsky.embed.recordWithMedia')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: $Type<'app.bsky.embed.recordWithMedia', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.recordWithMedia#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface View {
@@ -43,14 +42,12 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.recordWithMedia#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: $Type<'app.bsky.embed.recordWithMedia', 'view'> } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.recordWithMedia#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/embed/video.ts b/packages/ozone/src/lexicon/types/app/bsky/embed/video.ts
index 50eb59aa038..e504f8adce9 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/embed/video.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/embed/video.ts
@@ -2,11 +2,13 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyEmbedDefs from './defs'
 
+const id = 'app.bsky.embed.video'
+
 export interface Main {
   video: BlobRef
   captions?: Caption[]
@@ -16,17 +18,14 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.video#main' ||
-      v.$type === 'app.bsky.embed.video')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: $Type<'app.bsky.embed.video', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface Caption {
@@ -35,16 +34,14 @@ export interface Caption {
   [k: string]: unknown
 }
 
-export function isCaption(v: unknown): v is Caption {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.video#caption'
-  )
+export function isCaption(
+  v: unknown,
+): v is Caption & { $type: $Type<'app.bsky.embed.video', 'caption'> } {
+  return is$typed(v, id, 'caption')
 }
 
-export function validateCaption(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#caption', v)
+export function validateCaption(v: unknown) {
+  return lexicons.validate(`${id}#caption`, v) as ValidationResult<Caption>
 }
 
 export interface View {
@@ -56,12 +53,12 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.video#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: $Type<'app.bsky.embed.video', 'view'> } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/defs.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/defs.ts
index 1c6f6ce78f6..076792ac3c8 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/defs.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as AppBskyEmbedImages from '../embed/images'
 import * as AppBskyEmbedVideo from '../embed/video'
@@ -15,6 +15,8 @@ import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as AppBskyGraphDefs from '../graph/defs'
 
+const id = 'app.bsky.feed.defs'
+
 export interface PostView {
   uri: string
   cid: string
@@ -38,14 +40,14 @@ export interface PostView {
   [k: string]: unknown
 }
 
-export function isPostView(v: unknown): v is PostView {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.defs#postView'
-  )
+export function isPostView(
+  v: unknown,
+): v is PostView & { $type: $Type<'app.bsky.feed.defs', 'postView'> } {
+  return is$typed(v, id, 'postView')
 }
 
-export function validatePostView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#postView', v)
+export function validatePostView(v: unknown) {
+  return lexicons.validate(`${id}#postView`, v) as ValidationResult<PostView>
 }
 
 /** Metadata about the requesting account's relationship with the subject content. Only has meaningful content for authed requests. */
@@ -59,16 +61,17 @@ export interface ViewerState {
   [k: string]: unknown
 }
 
-export function isViewerState(v: unknown): v is ViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#viewerState'
-  )
+export function isViewerState(
+  v: unknown,
+): v is ViewerState & { $type: $Type<'app.bsky.feed.defs', 'viewerState'> } {
+  return is$typed(v, id, 'viewerState')
 }
 
-export function validateViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#viewerState', v)
+export function validateViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewerState`,
+    v,
+  ) as ValidationResult<ViewerState>
 }
 
 export interface FeedViewPost {
@@ -80,16 +83,17 @@ export interface FeedViewPost {
   [k: string]: unknown
 }
 
-export function isFeedViewPost(v: unknown): v is FeedViewPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#feedViewPost'
-  )
+export function isFeedViewPost(
+  v: unknown,
+): v is FeedViewPost & { $type: $Type<'app.bsky.feed.defs', 'feedViewPost'> } {
+  return is$typed(v, id, 'feedViewPost')
 }
 
-export function validateFeedViewPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#feedViewPost', v)
+export function validateFeedViewPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#feedViewPost`,
+    v,
+  ) as ValidationResult<FeedViewPost>
 }
 
 export interface ReplyRef {
@@ -107,14 +111,14 @@ export interface ReplyRef {
   [k: string]: unknown
 }
 
-export function isReplyRef(v: unknown): v is ReplyRef {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.defs#replyRef'
-  )
+export function isReplyRef(
+  v: unknown,
+): v is ReplyRef & { $type: $Type<'app.bsky.feed.defs', 'replyRef'> } {
+  return is$typed(v, id, 'replyRef')
 }
 
-export function validateReplyRef(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#replyRef', v)
+export function validateReplyRef(v: unknown) {
+  return lexicons.validate(`${id}#replyRef`, v) as ValidationResult<ReplyRef>
 }
 
 export interface ReasonRepost {
@@ -123,32 +127,31 @@ export interface ReasonRepost {
   [k: string]: unknown
 }
 
-export function isReasonRepost(v: unknown): v is ReasonRepost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#reasonRepost'
-  )
+export function isReasonRepost(
+  v: unknown,
+): v is ReasonRepost & { $type: $Type<'app.bsky.feed.defs', 'reasonRepost'> } {
+  return is$typed(v, id, 'reasonRepost')
 }
 
-export function validateReasonRepost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#reasonRepost', v)
+export function validateReasonRepost(v: unknown) {
+  return lexicons.validate(
+    `${id}#reasonRepost`,
+    v,
+  ) as ValidationResult<ReasonRepost>
 }
 
 export interface ReasonPin {
   [k: string]: unknown
 }
 
-export function isReasonPin(v: unknown): v is ReasonPin {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#reasonPin'
-  )
+export function isReasonPin(
+  v: unknown,
+): v is ReasonPin & { $type: $Type<'app.bsky.feed.defs', 'reasonPin'> } {
+  return is$typed(v, id, 'reasonPin')
 }
 
-export function validateReasonPin(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#reasonPin', v)
+export function validateReasonPin(v: unknown) {
+  return lexicons.validate(`${id}#reasonPin`, v) as ValidationResult<ReasonPin>
 }
 
 export interface ThreadViewPost {
@@ -167,16 +170,17 @@ export interface ThreadViewPost {
   [k: string]: unknown
 }
 
-export function isThreadViewPost(v: unknown): v is ThreadViewPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#threadViewPost'
-  )
+export function isThreadViewPost(v: unknown): v is ThreadViewPost & {
+  $type: $Type<'app.bsky.feed.defs', 'threadViewPost'>
+} {
+  return is$typed(v, id, 'threadViewPost')
 }
 
-export function validateThreadViewPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#threadViewPost', v)
+export function validateThreadViewPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#threadViewPost`,
+    v,
+  ) as ValidationResult<ThreadViewPost>
 }
 
 export interface NotFoundPost {
@@ -185,16 +189,17 @@ export interface NotFoundPost {
   [k: string]: unknown
 }
 
-export function isNotFoundPost(v: unknown): v is NotFoundPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#notFoundPost'
-  )
+export function isNotFoundPost(
+  v: unknown,
+): v is NotFoundPost & { $type: $Type<'app.bsky.feed.defs', 'notFoundPost'> } {
+  return is$typed(v, id, 'notFoundPost')
 }
 
-export function validateNotFoundPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#notFoundPost', v)
+export function validateNotFoundPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#notFoundPost`,
+    v,
+  ) as ValidationResult<NotFoundPost>
 }
 
 export interface BlockedPost {
@@ -204,16 +209,17 @@ export interface BlockedPost {
   [k: string]: unknown
 }
 
-export function isBlockedPost(v: unknown): v is BlockedPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#blockedPost'
-  )
+export function isBlockedPost(
+  v: unknown,
+): v is BlockedPost & { $type: $Type<'app.bsky.feed.defs', 'blockedPost'> } {
+  return is$typed(v, id, 'blockedPost')
 }
 
-export function validateBlockedPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#blockedPost', v)
+export function validateBlockedPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#blockedPost`,
+    v,
+  ) as ValidationResult<BlockedPost>
 }
 
 export interface BlockedAuthor {
@@ -222,16 +228,17 @@ export interface BlockedAuthor {
   [k: string]: unknown
 }
 
-export function isBlockedAuthor(v: unknown): v is BlockedAuthor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#blockedAuthor'
-  )
+export function isBlockedAuthor(v: unknown): v is BlockedAuthor & {
+  $type: $Type<'app.bsky.feed.defs', 'blockedAuthor'>
+} {
+  return is$typed(v, id, 'blockedAuthor')
 }
 
-export function validateBlockedAuthor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#blockedAuthor', v)
+export function validateBlockedAuthor(v: unknown) {
+  return lexicons.validate(
+    `${id}#blockedAuthor`,
+    v,
+  ) as ValidationResult<BlockedAuthor>
 }
 
 export interface GeneratorView {
@@ -251,16 +258,17 @@ export interface GeneratorView {
   [k: string]: unknown
 }
 
-export function isGeneratorView(v: unknown): v is GeneratorView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#generatorView'
-  )
+export function isGeneratorView(v: unknown): v is GeneratorView & {
+  $type: $Type<'app.bsky.feed.defs', 'generatorView'>
+} {
+  return is$typed(v, id, 'generatorView')
 }
 
-export function validateGeneratorView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#generatorView', v)
+export function validateGeneratorView(v: unknown) {
+  return lexicons.validate(
+    `${id}#generatorView`,
+    v,
+  ) as ValidationResult<GeneratorView>
 }
 
 export interface GeneratorViewerState {
@@ -268,16 +276,19 @@ export interface GeneratorViewerState {
   [k: string]: unknown
 }
 
-export function isGeneratorViewerState(v: unknown): v is GeneratorViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#generatorViewerState'
-  )
+export function isGeneratorViewerState(
+  v: unknown,
+): v is GeneratorViewerState & {
+  $type: $Type<'app.bsky.feed.defs', 'generatorViewerState'>
+} {
+  return is$typed(v, id, 'generatorViewerState')
 }
 
-export function validateGeneratorViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#generatorViewerState', v)
+export function validateGeneratorViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#generatorViewerState`,
+    v,
+  ) as ValidationResult<GeneratorViewerState>
 }
 
 export interface SkeletonFeedPost {
@@ -291,16 +302,17 @@ export interface SkeletonFeedPost {
   [k: string]: unknown
 }
 
-export function isSkeletonFeedPost(v: unknown): v is SkeletonFeedPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonFeedPost'
-  )
+export function isSkeletonFeedPost(v: unknown): v is SkeletonFeedPost & {
+  $type: $Type<'app.bsky.feed.defs', 'skeletonFeedPost'>
+} {
+  return is$typed(v, id, 'skeletonFeedPost')
 }
 
-export function validateSkeletonFeedPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonFeedPost', v)
+export function validateSkeletonFeedPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonFeedPost`,
+    v,
+  ) as ValidationResult<SkeletonFeedPost>
 }
 
 export interface SkeletonReasonRepost {
@@ -308,32 +320,36 @@ export interface SkeletonReasonRepost {
   [k: string]: unknown
 }
 
-export function isSkeletonReasonRepost(v: unknown): v is SkeletonReasonRepost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonReasonRepost'
-  )
+export function isSkeletonReasonRepost(
+  v: unknown,
+): v is SkeletonReasonRepost & {
+  $type: $Type<'app.bsky.feed.defs', 'skeletonReasonRepost'>
+} {
+  return is$typed(v, id, 'skeletonReasonRepost')
 }
 
-export function validateSkeletonReasonRepost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonReasonRepost', v)
+export function validateSkeletonReasonRepost(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonReasonRepost`,
+    v,
+  ) as ValidationResult<SkeletonReasonRepost>
 }
 
 export interface SkeletonReasonPin {
   [k: string]: unknown
 }
 
-export function isSkeletonReasonPin(v: unknown): v is SkeletonReasonPin {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonReasonPin'
-  )
+export function isSkeletonReasonPin(v: unknown): v is SkeletonReasonPin & {
+  $type: $Type<'app.bsky.feed.defs', 'skeletonReasonPin'>
+} {
+  return is$typed(v, id, 'skeletonReasonPin')
 }
 
-export function validateSkeletonReasonPin(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonReasonPin', v)
+export function validateSkeletonReasonPin(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonReasonPin`,
+    v,
+  ) as ValidationResult<SkeletonReasonPin>
 }
 
 export interface ThreadgateView {
@@ -344,16 +360,17 @@ export interface ThreadgateView {
   [k: string]: unknown
 }
 
-export function isThreadgateView(v: unknown): v is ThreadgateView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#threadgateView'
-  )
+export function isThreadgateView(v: unknown): v is ThreadgateView & {
+  $type: $Type<'app.bsky.feed.defs', 'threadgateView'>
+} {
+  return is$typed(v, id, 'threadgateView')
 }
 
-export function validateThreadgateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#threadgateView', v)
+export function validateThreadgateView(v: unknown) {
+  return lexicons.validate(
+    `${id}#threadgateView`,
+    v,
+  ) as ValidationResult<ThreadgateView>
 }
 
 export interface Interaction {
@@ -377,39 +394,40 @@ export interface Interaction {
   [k: string]: unknown
 }
 
-export function isInteraction(v: unknown): v is Interaction {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#interaction'
-  )
+export function isInteraction(
+  v: unknown,
+): v is Interaction & { $type: $Type<'app.bsky.feed.defs', 'interaction'> } {
+  return is$typed(v, id, 'interaction')
 }
 
-export function validateInteraction(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#interaction', v)
+export function validateInteraction(v: unknown) {
+  return lexicons.validate(
+    `${id}#interaction`,
+    v,
+  ) as ValidationResult<Interaction>
 }
 
 /** Request that less content like the given feed item be shown in the feed */
-export const REQUESTLESS = 'app.bsky.feed.defs#requestLess'
+export const REQUESTLESS = `${id}#requestLess`
 /** Request that more content like the given feed item be shown in the feed */
-export const REQUESTMORE = 'app.bsky.feed.defs#requestMore'
+export const REQUESTMORE = `${id}#requestMore`
 /** User clicked through to the feed item */
-export const CLICKTHROUGHITEM = 'app.bsky.feed.defs#clickthroughItem'
+export const CLICKTHROUGHITEM = `${id}#clickthroughItem`
 /** User clicked through to the author of the feed item */
-export const CLICKTHROUGHAUTHOR = 'app.bsky.feed.defs#clickthroughAuthor'
+export const CLICKTHROUGHAUTHOR = `${id}#clickthroughAuthor`
 /** User clicked through to the reposter of the feed item */
-export const CLICKTHROUGHREPOSTER = 'app.bsky.feed.defs#clickthroughReposter'
+export const CLICKTHROUGHREPOSTER = `${id}#clickthroughReposter`
 /** User clicked through to the embedded content of the feed item */
-export const CLICKTHROUGHEMBED = 'app.bsky.feed.defs#clickthroughEmbed'
+export const CLICKTHROUGHEMBED = `${id}#clickthroughEmbed`
 /** Feed item was seen by user */
-export const INTERACTIONSEEN = 'app.bsky.feed.defs#interactionSeen'
+export const INTERACTIONSEEN = `${id}#interactionSeen`
 /** User liked the feed item */
-export const INTERACTIONLIKE = 'app.bsky.feed.defs#interactionLike'
+export const INTERACTIONLIKE = `${id}#interactionLike`
 /** User reposted the feed item */
-export const INTERACTIONREPOST = 'app.bsky.feed.defs#interactionRepost'
+export const INTERACTIONREPOST = `${id}#interactionRepost`
 /** User replied to the feed item */
-export const INTERACTIONREPLY = 'app.bsky.feed.defs#interactionReply'
+export const INTERACTIONREPLY = `${id}#interactionReply`
 /** User quoted the feed item */
-export const INTERACTIONQUOTE = 'app.bsky.feed.defs#interactionQuote'
+export const INTERACTIONQUOTE = `${id}#interactionQuote`
 /** User shared the feed item */
-export const INTERACTIONSHARE = 'app.bsky.feed.defs#interactionShare'
+export const INTERACTIONSHARE = `${id}#interactionShare`
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
index 5bf8699a3ca..b2f3af11a08 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.feed.describeFeedGenerator'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -49,16 +51,14 @@ export interface Feed {
   [k: string]: unknown
 }
 
-export function isFeed(v: unknown): v is Feed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.describeFeedGenerator#feed'
-  )
+export function isFeed(
+  v: unknown,
+): v is Feed & { $type: $Type<'app.bsky.feed.describeFeedGenerator', 'feed'> } {
+  return is$typed(v, id, 'feed')
 }
 
-export function validateFeed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.describeFeedGenerator#feed', v)
+export function validateFeed(v: unknown) {
+  return lexicons.validate(`${id}#feed`, v) as ValidationResult<Feed>
 }
 
 export interface Links {
@@ -67,14 +67,12 @@ export interface Links {
   [k: string]: unknown
 }
 
-export function isLinks(v: unknown): v is Links {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.describeFeedGenerator#links'
-  )
+export function isLinks(v: unknown): v is Links & {
+  $type: $Type<'app.bsky.feed.describeFeedGenerator', 'links'>
+} {
+  return is$typed(v, id, 'links')
 }
 
-export function validateLinks(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.describeFeedGenerator#links', v)
+export function validateLinks(v: unknown) {
+  return lexicons.validate(`${id}#links`, v) as ValidationResult<Links>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/generator.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/generator.ts
index eb8e8d0f633..2fac60cbf6e 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/generator.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/generator.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const id = 'app.bsky.feed.generator'
+
 export interface Record {
   did: string
   displayName: string
@@ -23,15 +25,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.generator#main' ||
-      v.$type === 'app.bsky.feed.generator')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.feed.generator', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.generator#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getActorFeeds.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
index 0b8afff4ec8..a680bebbc7e 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getActorFeeds'
+
 export interface QueryParams {
   actor: string
   limit: number
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getActorLikes.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getActorLikes.ts
index da315ae33c7..5d2852087d7 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getActorLikes.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getActorLikes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getActorLikes'
+
 export interface QueryParams {
   actor: string
   limit: number
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
index 60fa2f74f92..7719ac0368a 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getAuthorFeed'
+
 export interface QueryParams {
   actor: string
   limit: number
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeed.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeed.ts
index e03913a6fb3..9224f829059 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeed.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeed.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getFeed'
+
 export interface QueryParams {
   feed: string
   limit: number
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
index 7ab89057a8c..c3981ea75b4 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getFeedGenerator'
+
 export interface QueryParams {
   /** AT-URI of the feed generator record. */
   feed: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
index 21963a91e2e..4745177b4b5 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getFeedGenerators'
+
 export interface QueryParams {
   feeds: string[]
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
index ca1cef20f08..07eba8c59f4 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getFeedSkeleton'
+
 export interface QueryParams {
   /** Reference to feed generator record describing the specific feed being requested. */
   feed: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getLikes.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getLikes.ts
index 275d99bba3d..190905772f5 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getLikes.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getLikes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.feed.getLikes'
+
 export interface QueryParams {
   /** AT-URI of the subject (eg, a post record). */
   uri: string
@@ -60,12 +62,12 @@ export interface Like {
   [k: string]: unknown
 }
 
-export function isLike(v: unknown): v is Like {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.getLikes#like'
-  )
+export function isLike(
+  v: unknown,
+): v is Like & { $type: $Type<'app.bsky.feed.getLikes', 'like'> } {
+  return is$typed(v, id, 'like')
 }
 
-export function validateLike(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.getLikes#like', v)
+export function validateLike(v: unknown) {
+  return lexicons.validate(`${id}#like`, v) as ValidationResult<Like>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getListFeed.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getListFeed.ts
index 84e12deaa92..a31bb6ddd62 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getListFeed.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getListFeed.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getListFeed'
+
 export interface QueryParams {
   /** Reference (AT-URI) to the list record. */
   list: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getPostThread.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getPostThread.ts
index 768977193ef..444eac417c3 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getPostThread.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getPostThread.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getPostThread'
+
 export interface QueryParams {
   /** Reference (AT-URI) to post record. */
   uri: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getPosts.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getPosts.ts
index 85000c74787..da6bf3696e2 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getPosts.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getPosts.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getPosts'
+
 export interface QueryParams {
   /** List of post AT-URIs to return hydrated views for. */
   uris: string[]
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getQuotes.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getQuotes.ts
index 38d04ad88c1..c71113bace2 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getQuotes.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getQuotes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getQuotes'
+
 export interface QueryParams {
   /** Reference (AT-URI) of post record */
   uri: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getRepostedBy.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
index 40e008815d9..25bf3c8f81b 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.feed.getRepostedBy'
+
 export interface QueryParams {
   /** Reference (AT-URI) of post record */
   uri: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
index d1ec590f33d..c34be54afdc 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getSuggestedFeeds'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/getTimeline.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/getTimeline.ts
index 5202c9eb6e3..e3f1f0ce0bc 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/getTimeline.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/getTimeline.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getTimeline'
+
 export interface QueryParams {
   /** Variant 'algorithm' for timeline. Implementation-specific. NOTE: most feed flexibility has been moved to feed generator mechanism. */
   algorithm?: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/like.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/like.ts
index 1da9dd940dc..17f3d126a33 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/like.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/like.ts
@@ -2,25 +2,25 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const id = 'app.bsky.feed.like'
+
 export interface Record {
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.like#main' || v.$type === 'app.bsky.feed.like')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.feed.like', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.like#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/post.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/post.ts
index f9f2827c8d0..cc632e3e4c8 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/post.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/post.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as AppBskyEmbedImages from '../embed/images'
 import * as AppBskyEmbedVideo from '../embed/video'
@@ -14,6 +14,8 @@ import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const id = 'app.bsky.feed.post'
+
 export interface Record {
   /** The primary post content. May be an empty string, if there are embeds. */
   text: string
@@ -41,16 +43,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.post#main' || v.$type === 'app.bsky.feed.post')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.feed.post', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 export interface ReplyRef {
@@ -59,14 +59,14 @@ export interface ReplyRef {
   [k: string]: unknown
 }
 
-export function isReplyRef(v: unknown): v is ReplyRef {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.post#replyRef'
-  )
+export function isReplyRef(
+  v: unknown,
+): v is ReplyRef & { $type: $Type<'app.bsky.feed.post', 'replyRef'> } {
+  return is$typed(v, id, 'replyRef')
 }
 
-export function validateReplyRef(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#replyRef', v)
+export function validateReplyRef(v: unknown) {
+  return lexicons.validate(`${id}#replyRef`, v) as ValidationResult<ReplyRef>
 }
 
 /** Deprecated: use facets instead. */
@@ -78,14 +78,14 @@ export interface Entity {
   [k: string]: unknown
 }
 
-export function isEntity(v: unknown): v is Entity {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.post#entity'
-  )
+export function isEntity(
+  v: unknown,
+): v is Entity & { $type: $Type<'app.bsky.feed.post', 'entity'> } {
+  return is$typed(v, id, 'entity')
 }
 
-export function validateEntity(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#entity', v)
+export function validateEntity(v: unknown) {
+  return lexicons.validate(`${id}#entity`, v) as ValidationResult<Entity>
 }
 
 /** Deprecated. Use app.bsky.richtext instead -- A text segment. Start is inclusive, end is exclusive. Indices are for utf16-encoded strings. */
@@ -95,14 +95,12 @@ export interface TextSlice {
   [k: string]: unknown
 }
 
-export function isTextSlice(v: unknown): v is TextSlice {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.post#textSlice'
-  )
+export function isTextSlice(
+  v: unknown,
+): v is TextSlice & { $type: $Type<'app.bsky.feed.post', 'textSlice'> } {
+  return is$typed(v, id, 'textSlice')
 }
 
-export function validateTextSlice(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#textSlice', v)
+export function validateTextSlice(v: unknown) {
+  return lexicons.validate(`${id}#textSlice`, v) as ValidationResult<TextSlice>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/postgate.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/postgate.ts
index dcc4c22a425..aa757b8281d 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/postgate.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/postgate.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.feed.postgate'
 
 export interface Record {
   createdAt: string
@@ -16,17 +18,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.postgate#main' ||
-      v.$type === 'app.bsky.feed.postgate')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.feed.postgate', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.postgate#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 /** Disables embedding of this post. */
@@ -34,14 +33,15 @@ export interface DisableRule {
   [k: string]: unknown
 }
 
-export function isDisableRule(v: unknown): v is DisableRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.postgate#disableRule'
-  )
+export function isDisableRule(v: unknown): v is DisableRule & {
+  $type: $Type<'app.bsky.feed.postgate', 'disableRule'>
+} {
+  return is$typed(v, id, 'disableRule')
 }
 
-export function validateDisableRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.postgate#disableRule', v)
+export function validateDisableRule(v: unknown) {
+  return lexicons.validate(
+    `${id}#disableRule`,
+    v,
+  ) as ValidationResult<DisableRule>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/repost.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/repost.ts
index 4c836d76e2a..0f1101898d5 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/repost.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/repost.ts
@@ -2,26 +2,25 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const id = 'app.bsky.feed.repost'
+
 export interface Record {
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.repost#main' ||
-      v.$type === 'app.bsky.feed.repost')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.feed.repost', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.repost#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/searchPosts.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/searchPosts.ts
index 14efa5276f8..50152c309ae 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/searchPosts.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/searchPosts.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.searchPosts'
+
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
   q: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/sendInteractions.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/sendInteractions.ts
index c22fc1cb2fb..59bc2c698b8 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/sendInteractions.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/sendInteractions.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.sendInteractions'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/feed/threadgate.ts b/packages/ozone/src/lexicon/types/app/bsky/feed/threadgate.ts
index c0e618c8f53..04a6205c8ad 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/feed/threadgate.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/feed/threadgate.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.feed.threadgate'
 
 export interface Record {
   /** Reference (AT-URI) to the post record. */
@@ -21,17 +23,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.threadgate#main' ||
-      v.$type === 'app.bsky.feed.threadgate')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.feed.threadgate', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 /** Allow replies from actors mentioned in your post. */
@@ -39,16 +38,17 @@ export interface MentionRule {
   [k: string]: unknown
 }
 
-export function isMentionRule(v: unknown): v is MentionRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#mentionRule'
-  )
+export function isMentionRule(v: unknown): v is MentionRule & {
+  $type: $Type<'app.bsky.feed.threadgate', 'mentionRule'>
+} {
+  return is$typed(v, id, 'mentionRule')
 }
 
-export function validateMentionRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#mentionRule', v)
+export function validateMentionRule(v: unknown) {
+  return lexicons.validate(
+    `${id}#mentionRule`,
+    v,
+  ) as ValidationResult<MentionRule>
 }
 
 /** Allow replies from actors you follow. */
@@ -56,16 +56,17 @@ export interface FollowingRule {
   [k: string]: unknown
 }
 
-export function isFollowingRule(v: unknown): v is FollowingRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#followingRule'
-  )
+export function isFollowingRule(v: unknown): v is FollowingRule & {
+  $type: $Type<'app.bsky.feed.threadgate', 'followingRule'>
+} {
+  return is$typed(v, id, 'followingRule')
 }
 
-export function validateFollowingRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#followingRule', v)
+export function validateFollowingRule(v: unknown) {
+  return lexicons.validate(
+    `${id}#followingRule`,
+    v,
+  ) as ValidationResult<FollowingRule>
 }
 
 /** Allow replies from actors on a list. */
@@ -74,14 +75,12 @@ export interface ListRule {
   [k: string]: unknown
 }
 
-export function isListRule(v: unknown): v is ListRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#listRule'
-  )
+export function isListRule(
+  v: unknown,
+): v is ListRule & { $type: $Type<'app.bsky.feed.threadgate', 'listRule'> } {
+  return is$typed(v, id, 'listRule')
 }
 
-export function validateListRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#listRule', v)
+export function validateListRule(v: unknown) {
+  return lexicons.validate(`${id}#listRule`, v) as ValidationResult<ListRule>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/block.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/block.ts
index b7f19f126b7..167afdf2f9b 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/block.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/block.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.graph.block'
 
 export interface Record {
   /** DID of the account to be blocked. */
@@ -13,15 +15,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.block#main' ||
-      v.$type === 'app.bsky.graph.block')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.graph.block', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.block#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/defs.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/defs.ts
index 63ecf7e00c0..08792d3103a 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/defs.ts
@@ -2,14 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as AppBskyFeedDefs from '../feed/defs'
 
+const id = 'app.bsky.graph.defs'
+
 export interface ListViewBasic {
   uri: string
   cid: string
@@ -23,16 +25,17 @@ export interface ListViewBasic {
   [k: string]: unknown
 }
 
-export function isListViewBasic(v: unknown): v is ListViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listViewBasic'
-  )
+export function isListViewBasic(v: unknown): v is ListViewBasic & {
+  $type: $Type<'app.bsky.graph.defs', 'listViewBasic'>
+} {
+  return is$typed(v, id, 'listViewBasic')
 }
 
-export function validateListViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listViewBasic', v)
+export function validateListViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#listViewBasic`,
+    v,
+  ) as ValidationResult<ListViewBasic>
 }
 
 export interface ListView {
@@ -51,16 +54,14 @@ export interface ListView {
   [k: string]: unknown
 }
 
-export function isListView(v: unknown): v is ListView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listView'
-  )
+export function isListView(
+  v: unknown,
+): v is ListView & { $type: $Type<'app.bsky.graph.defs', 'listView'> } {
+  return is$typed(v, id, 'listView')
 }
 
-export function validateListView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listView', v)
+export function validateListView(v: unknown) {
+  return lexicons.validate(`${id}#listView`, v) as ValidationResult<ListView>
 }
 
 export interface ListItemView {
@@ -69,16 +70,17 @@ export interface ListItemView {
   [k: string]: unknown
 }
 
-export function isListItemView(v: unknown): v is ListItemView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listItemView'
-  )
+export function isListItemView(
+  v: unknown,
+): v is ListItemView & { $type: $Type<'app.bsky.graph.defs', 'listItemView'> } {
+  return is$typed(v, id, 'listItemView')
 }
 
-export function validateListItemView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listItemView', v)
+export function validateListItemView(v: unknown) {
+  return lexicons.validate(
+    `${id}#listItemView`,
+    v,
+  ) as ValidationResult<ListItemView>
 }
 
 export interface StarterPackView {
@@ -96,16 +98,17 @@ export interface StarterPackView {
   [k: string]: unknown
 }
 
-export function isStarterPackView(v: unknown): v is StarterPackView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#starterPackView'
-  )
+export function isStarterPackView(v: unknown): v is StarterPackView & {
+  $type: $Type<'app.bsky.graph.defs', 'starterPackView'>
+} {
+  return is$typed(v, id, 'starterPackView')
 }
 
-export function validateStarterPackView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#starterPackView', v)
+export function validateStarterPackView(v: unknown) {
+  return lexicons.validate(
+    `${id}#starterPackView`,
+    v,
+  ) as ValidationResult<StarterPackView>
 }
 
 export interface StarterPackViewBasic {
@@ -121,16 +124,19 @@ export interface StarterPackViewBasic {
   [k: string]: unknown
 }
 
-export function isStarterPackViewBasic(v: unknown): v is StarterPackViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#starterPackViewBasic'
-  )
+export function isStarterPackViewBasic(
+  v: unknown,
+): v is StarterPackViewBasic & {
+  $type: $Type<'app.bsky.graph.defs', 'starterPackViewBasic'>
+} {
+  return is$typed(v, id, 'starterPackViewBasic')
 }
 
-export function validateStarterPackViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#starterPackViewBasic', v)
+export function validateStarterPackViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#starterPackViewBasic`,
+    v,
+  ) as ValidationResult<StarterPackViewBasic>
 }
 
 export type ListPurpose =
@@ -140,11 +146,11 @@ export type ListPurpose =
   | (string & {})
 
 /** A list of actors to apply an aggregate moderation action (mute/block) on. */
-export const MODLIST = 'app.bsky.graph.defs#modlist'
+export const MODLIST = `${id}#modlist`
 /** A list of actors used for curation purposes such as list feeds or interaction gating. */
-export const CURATELIST = 'app.bsky.graph.defs#curatelist'
+export const CURATELIST = `${id}#curatelist`
 /** A list of actors used for only for reference purposes such as within a starter pack. */
-export const REFERENCELIST = 'app.bsky.graph.defs#referencelist'
+export const REFERENCELIST = `${id}#referencelist`
 
 export interface ListViewerState {
   muted?: boolean
@@ -152,16 +158,17 @@ export interface ListViewerState {
   [k: string]: unknown
 }
 
-export function isListViewerState(v: unknown): v is ListViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listViewerState'
-  )
+export function isListViewerState(v: unknown): v is ListViewerState & {
+  $type: $Type<'app.bsky.graph.defs', 'listViewerState'>
+} {
+  return is$typed(v, id, 'listViewerState')
 }
 
-export function validateListViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listViewerState', v)
+export function validateListViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#listViewerState`,
+    v,
+  ) as ValidationResult<ListViewerState>
 }
 
 /** indicates that a handle or DID could not be resolved */
@@ -171,16 +178,17 @@ export interface NotFoundActor {
   [k: string]: unknown
 }
 
-export function isNotFoundActor(v: unknown): v is NotFoundActor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#notFoundActor'
-  )
+export function isNotFoundActor(v: unknown): v is NotFoundActor & {
+  $type: $Type<'app.bsky.graph.defs', 'notFoundActor'>
+} {
+  return is$typed(v, id, 'notFoundActor')
 }
 
-export function validateNotFoundActor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#notFoundActor', v)
+export function validateNotFoundActor(v: unknown) {
+  return lexicons.validate(
+    `${id}#notFoundActor`,
+    v,
+  ) as ValidationResult<NotFoundActor>
 }
 
 /** lists the bi-directional graph relationships between one actor (not indicated in the object), and the target actors (the DID included in the object) */
@@ -193,14 +201,15 @@ export interface Relationship {
   [k: string]: unknown
 }
 
-export function isRelationship(v: unknown): v is Relationship {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#relationship'
-  )
+export function isRelationship(
+  v: unknown,
+): v is Relationship & { $type: $Type<'app.bsky.graph.defs', 'relationship'> } {
+  return is$typed(v, id, 'relationship')
 }
 
-export function validateRelationship(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#relationship', v)
+export function validateRelationship(v: unknown) {
+  return lexicons.validate(
+    `${id}#relationship`,
+    v,
+  ) as ValidationResult<Relationship>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/follow.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/follow.ts
index 4b74a58a5df..bb0f2d2dc3a 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/follow.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/follow.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.graph.follow'
 
 export interface Record {
   subject: string
@@ -12,15 +14,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.follow#main' ||
-      v.$type === 'app.bsky.graph.follow')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.graph.follow', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.follow#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
index 10250d0f3b4..ee9a8af4999 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getActorStarterPacks'
+
 export interface QueryParams {
   actor: string
   limit: number
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getBlocks.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getBlocks.ts
index 1fc9cd8ce37..d353dc99267 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getBlocks.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getBlocks.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.graph.getBlocks'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getFollowers.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getFollowers.ts
index f5645eaef29..a44fe4c7ca9 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getFollowers.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getFollowers.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.graph.getFollowers'
+
 export interface QueryParams {
   actor: string
   limit: number
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getFollows.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getFollows.ts
index b9bd249da45..af3b8214783 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getFollows.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getFollows.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.graph.getFollows'
+
 export interface QueryParams {
   actor: string
   limit: number
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
index f5645eaef29..0cdb01d99df 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.graph.getKnownFollowers'
+
 export interface QueryParams {
   actor: string
   limit: number
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getList.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getList.ts
index 864a81b3833..444d463f7be 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getList.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getList.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getList'
+
 export interface QueryParams {
   /** Reference (AT-URI) of the list record to hydrate. */
   list: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getListBlocks.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getListBlocks.ts
index 7399a14fadc..2828969d77c 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getListBlocks.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getListBlocks.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getListBlocks'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getListMutes.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getListMutes.ts
index 7399a14fadc..25fc22a45e7 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getListMutes.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getListMutes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getListMutes'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getLists.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getLists.ts
index dc0c4f18bea..04c1e929899 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getLists.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getLists.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getLists'
+
 export interface QueryParams {
   /** The account (actor) to enumerate lists from. */
   actor: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getMutes.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getMutes.ts
index f450393522d..fcfbadd3154 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getMutes.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getMutes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.graph.getMutes'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getRelationships.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getRelationships.ts
index bd6b6e765ed..b169bc9de7e 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getRelationships.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getRelationships.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getRelationships'
+
 export interface QueryParams {
   /** Primary account requesting relationships for. */
   actor: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPack.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPack.ts
index 93fe21f0b13..906e412e1c5 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPack.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPack.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getStarterPack'
+
 export interface QueryParams {
   /** Reference (AT-URI) of the starter pack record. */
   starterPack: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPacks.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
index 4b9757b941e..829cfa6bc94 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getStarterPacks'
+
 export interface QueryParams {
   uris: string[]
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
index 99b97e708f5..7a59fd5716d 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.graph.getSuggestedFollowsByActor'
+
 export interface QueryParams {
   actor: string
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/list.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/list.ts
index 91c8ccee5bb..4fc99ad59d4 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/list.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/list.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyGraphDefs from './defs'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const id = 'app.bsky.graph.list'
+
 export interface Record {
   purpose: AppBskyGraphDefs.ListPurpose
   /** Display name for list; can not be empty. */
@@ -23,15 +25,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.list#main' ||
-      v.$type === 'app.bsky.graph.list')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.graph.list', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.list#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/listblock.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/listblock.ts
index 592778c7a51..e159ed9b6d1 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/listblock.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/listblock.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.graph.listblock'
 
 export interface Record {
   /** Reference (AT-URI) to the mod list record. */
@@ -13,15 +15,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.listblock#main' ||
-      v.$type === 'app.bsky.graph.listblock')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.graph.listblock', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.listblock#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/listitem.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/listitem.ts
index 5e93b34a111..164196cfc25 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/listitem.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/listitem.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.graph.listitem'
 
 export interface Record {
   /** The account which is included on the list. */
@@ -15,15 +17,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.listitem#main' ||
-      v.$type === 'app.bsky.graph.listitem')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.graph.listitem', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.listitem#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/muteActor.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/muteActor.ts
index baa9844046a..aa9b7a1b950 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/muteActor.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/muteActor.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.graph.muteActor'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/muteActorList.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/muteActorList.ts
index 6a68f680a1c..0acc1da0dc2 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/muteActorList.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/muteActorList.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.graph.muteActorList'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/muteThread.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/muteThread.ts
index 928c56b6fc3..552bff9572f 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/muteThread.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/muteThread.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.graph.muteThread'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
index dea496aa50f..643bb579fe1 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.searchStarterPacks'
+
 export interface QueryParams {
   /** Search query string. Syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
   q: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/starterpack.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/starterpack.ts
index 0daf8daf688..d7cb5b48930 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/starterpack.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/starterpack.ts
@@ -2,11 +2,13 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 
+const id = 'app.bsky.graph.starterpack'
+
 export interface Record {
   /** Display name for starter pack; can not be empty. */
   name: string
@@ -19,17 +21,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.starterpack#main' ||
-      v.$type === 'app.bsky.graph.starterpack')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.graph.starterpack', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.starterpack#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 export interface FeedItem {
@@ -37,14 +36,12 @@ export interface FeedItem {
   [k: string]: unknown
 }
 
-export function isFeedItem(v: unknown): v is FeedItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.starterpack#feedItem'
-  )
+export function isFeedItem(
+  v: unknown,
+): v is FeedItem & { $type: $Type<'app.bsky.graph.starterpack', 'feedItem'> } {
+  return is$typed(v, id, 'feedItem')
 }
 
-export function validateFeedItem(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.starterpack#feedItem', v)
+export function validateFeedItem(v: unknown) {
+  return lexicons.validate(`${id}#feedItem`, v) as ValidationResult<FeedItem>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActor.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActor.ts
index baa9844046a..74e02903ed7 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActor.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActor.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.graph.unmuteActor'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActorList.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
index 6a68f680a1c..44fc69490f8 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.graph.unmuteActorList'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteThread.ts b/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteThread.ts
index 928c56b6fc3..135db7e8e4f 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteThread.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/graph/unmuteThread.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.graph.unmuteThread'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/labeler/defs.ts b/packages/ozone/src/lexicon/types/app/bsky/labeler/defs.ts
index e12c7203c57..461e2b33cbd 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/labeler/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/labeler/defs.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const id = 'app.bsky.labeler.defs'
+
 export interface LabelerView {
   uri: string
   cid: string
@@ -19,16 +21,17 @@ export interface LabelerView {
   [k: string]: unknown
 }
 
-export function isLabelerView(v: unknown): v is LabelerView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerView'
-  )
+export function isLabelerView(
+  v: unknown,
+): v is LabelerView & { $type: $Type<'app.bsky.labeler.defs', 'labelerView'> } {
+  return is$typed(v, id, 'labelerView')
 }
 
-export function validateLabelerView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerView', v)
+export function validateLabelerView(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerView`,
+    v,
+  ) as ValidationResult<LabelerView>
 }
 
 export interface LabelerViewDetailed {
@@ -43,16 +46,17 @@ export interface LabelerViewDetailed {
   [k: string]: unknown
 }
 
-export function isLabelerViewDetailed(v: unknown): v is LabelerViewDetailed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerViewDetailed'
-  )
+export function isLabelerViewDetailed(v: unknown): v is LabelerViewDetailed & {
+  $type: $Type<'app.bsky.labeler.defs', 'labelerViewDetailed'>
+} {
+  return is$typed(v, id, 'labelerViewDetailed')
 }
 
-export function validateLabelerViewDetailed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerViewDetailed', v)
+export function validateLabelerViewDetailed(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerViewDetailed`,
+    v,
+  ) as ValidationResult<LabelerViewDetailed>
 }
 
 export interface LabelerViewerState {
@@ -60,16 +64,17 @@ export interface LabelerViewerState {
   [k: string]: unknown
 }
 
-export function isLabelerViewerState(v: unknown): v is LabelerViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerViewerState'
-  )
+export function isLabelerViewerState(v: unknown): v is LabelerViewerState & {
+  $type: $Type<'app.bsky.labeler.defs', 'labelerViewerState'>
+} {
+  return is$typed(v, id, 'labelerViewerState')
 }
 
-export function validateLabelerViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerViewerState', v)
+export function validateLabelerViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerViewerState`,
+    v,
+  ) as ValidationResult<LabelerViewerState>
 }
 
 export interface LabelerPolicies {
@@ -80,14 +85,15 @@ export interface LabelerPolicies {
   [k: string]: unknown
 }
 
-export function isLabelerPolicies(v: unknown): v is LabelerPolicies {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerPolicies'
-  )
+export function isLabelerPolicies(v: unknown): v is LabelerPolicies & {
+  $type: $Type<'app.bsky.labeler.defs', 'labelerPolicies'>
+} {
+  return is$typed(v, id, 'labelerPolicies')
 }
 
-export function validateLabelerPolicies(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerPolicies', v)
+export function validateLabelerPolicies(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerPolicies`,
+    v,
+  ) as ValidationResult<LabelerPolicies>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/labeler/getServices.ts b/packages/ozone/src/lexicon/types/app/bsky/labeler/getServices.ts
index faeb30b4798..c80da11262f 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/labeler/getServices.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/labeler/getServices.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyLabelerDefs from './defs'
 
+const id = 'app.bsky.labeler.getServices'
+
 export interface QueryParams {
   dids: string[]
   detailed: boolean
diff --git a/packages/ozone/src/lexicon/types/app/bsky/labeler/service.ts b/packages/ozone/src/lexicon/types/app/bsky/labeler/service.ts
index a044b8699b6..0abc40dc8d1 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/labeler/service.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/labeler/service.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyLabelerDefs from './defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const id = 'app.bsky.labeler.service'
+
 export interface Record {
   policies: AppBskyLabelerDefs.LabelerPolicies
   labels?:
@@ -17,15 +19,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.labeler.service#main' ||
-      v.$type === 'app.bsky.labeler.service')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.labeler.service', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.service#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/notification/getUnreadCount.ts b/packages/ozone/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
index 3931e24d3f0..d52044a760b 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.notification.getUnreadCount'
+
 export interface QueryParams {
   priority?: boolean
   seenAt?: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/notification/listNotifications.ts b/packages/ozone/src/lexicon/types/app/bsky/notification/listNotifications.ts
index 88fe90a0518..29af61a9449 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/notification/listNotifications.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/notification/listNotifications.ts
@@ -3,13 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const id = 'app.bsky.notification.listNotifications'
+
 export interface QueryParams {
   /** Notification reasons to include in response. */
   reasons?: string[]
@@ -76,17 +78,15 @@ export interface Notification {
   [k: string]: unknown
 }
 
-export function isNotification(v: unknown): v is Notification {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.notification.listNotifications#notification'
-  )
+export function isNotification(v: unknown): v is Notification & {
+  $type: $Type<'app.bsky.notification.listNotifications', 'notification'>
+} {
+  return is$typed(v, id, 'notification')
 }
 
-export function validateNotification(v: unknown): ValidationResult {
+export function validateNotification(v: unknown) {
   return lexicons.validate(
-    'app.bsky.notification.listNotifications#notification',
+    `${id}#notification`,
     v,
-  )
+  ) as ValidationResult<Notification>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/notification/putPreferences.ts b/packages/ozone/src/lexicon/types/app/bsky/notification/putPreferences.ts
index 2c3a9d6fdbb..0b5a9f066ad 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/notification/putPreferences.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/notification/putPreferences.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.notification.putPreferences'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/notification/registerPush.ts b/packages/ozone/src/lexicon/types/app/bsky/notification/registerPush.ts
index cce8f95839d..516babda578 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/notification/registerPush.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/notification/registerPush.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.notification.registerPush'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/notification/updateSeen.ts b/packages/ozone/src/lexicon/types/app/bsky/notification/updateSeen.ts
index 93db017a152..6312ceeaa15 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/notification/updateSeen.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/notification/updateSeen.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.notification.updateSeen'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/app/bsky/richtext/facet.ts b/packages/ozone/src/lexicon/types/app/bsky/richtext/facet.ts
index 139b5382caf..0a14274b608 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/richtext/facet.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/richtext/facet.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.richtext.facet'
 
 /** Annotation of a sub-string within rich text. */
 export interface Main {
@@ -13,17 +15,14 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.richtext.facet#main' ||
-      v.$type === 'app.bsky.richtext.facet')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: $Type<'app.bsky.richtext.facet', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 /** Facet feature for mention of another account. The text is usually a handle, including a '@' prefix, but the facet reference is a DID. */
@@ -32,16 +31,14 @@ export interface Mention {
   [k: string]: unknown
 }
 
-export function isMention(v: unknown): v is Mention {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#mention'
-  )
+export function isMention(
+  v: unknown,
+): v is Mention & { $type: $Type<'app.bsky.richtext.facet', 'mention'> } {
+  return is$typed(v, id, 'mention')
 }
 
-export function validateMention(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#mention', v)
+export function validateMention(v: unknown) {
+  return lexicons.validate(`${id}#mention`, v) as ValidationResult<Mention>
 }
 
 /** Facet feature for a URL. The text URL may have been simplified or truncated, but the facet reference should be a complete URL. */
@@ -50,16 +47,14 @@ export interface Link {
   [k: string]: unknown
 }
 
-export function isLink(v: unknown): v is Link {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#link'
-  )
+export function isLink(
+  v: unknown,
+): v is Link & { $type: $Type<'app.bsky.richtext.facet', 'link'> } {
+  return is$typed(v, id, 'link')
 }
 
-export function validateLink(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#link', v)
+export function validateLink(v: unknown) {
+  return lexicons.validate(`${id}#link`, v) as ValidationResult<Link>
 }
 
 /** Facet feature for a hashtag. The text usually includes a '#' prefix, but the facet reference should not (except in the case of 'double hash tags'). */
@@ -68,14 +63,14 @@ export interface Tag {
   [k: string]: unknown
 }
 
-export function isTag(v: unknown): v is Tag {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.richtext.facet#tag'
-  )
+export function isTag(
+  v: unknown,
+): v is Tag & { $type: $Type<'app.bsky.richtext.facet', 'tag'> } {
+  return is$typed(v, id, 'tag')
 }
 
-export function validateTag(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#tag', v)
+export function validateTag(v: unknown) {
+  return lexicons.validate(`${id}#tag`, v) as ValidationResult<Tag>
 }
 
 /** Specifies the sub-string range a facet feature applies to. Start index is inclusive, end index is exclusive. Indices are zero-indexed, counting bytes of the UTF-8 encoded text. NOTE: some languages, like Javascript, use UTF-16 or Unicode codepoints for string slice indexing; in these languages, convert to byte arrays before working with facets. */
@@ -85,14 +80,12 @@ export interface ByteSlice {
   [k: string]: unknown
 }
 
-export function isByteSlice(v: unknown): v is ByteSlice {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#byteSlice'
-  )
+export function isByteSlice(
+  v: unknown,
+): v is ByteSlice & { $type: $Type<'app.bsky.richtext.facet', 'byteSlice'> } {
+  return is$typed(v, id, 'byteSlice')
 }
 
-export function validateByteSlice(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#byteSlice', v)
+export function validateByteSlice(v: unknown) {
+  return lexicons.validate(`${id}#byteSlice`, v) as ValidationResult<ByteSlice>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/defs.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/defs.ts
index f25e35853c5..a8432782ce5 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/defs.ts
@@ -2,25 +2,28 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.unspecced.defs'
 
 export interface SkeletonSearchPost {
   uri: string
   [k: string]: unknown
 }
 
-export function isSkeletonSearchPost(v: unknown): v is SkeletonSearchPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchPost'
-  )
+export function isSkeletonSearchPost(v: unknown): v is SkeletonSearchPost & {
+  $type: $Type<'app.bsky.unspecced.defs', 'skeletonSearchPost'>
+} {
+  return is$typed(v, id, 'skeletonSearchPost')
 }
 
-export function validateSkeletonSearchPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#skeletonSearchPost', v)
+export function validateSkeletonSearchPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonSearchPost`,
+    v,
+  ) as ValidationResult<SkeletonSearchPost>
 }
 
 export interface SkeletonSearchActor {
@@ -28,16 +31,17 @@ export interface SkeletonSearchActor {
   [k: string]: unknown
 }
 
-export function isSkeletonSearchActor(v: unknown): v is SkeletonSearchActor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchActor'
-  )
+export function isSkeletonSearchActor(v: unknown): v is SkeletonSearchActor & {
+  $type: $Type<'app.bsky.unspecced.defs', 'skeletonSearchActor'>
+} {
+  return is$typed(v, id, 'skeletonSearchActor')
 }
 
-export function validateSkeletonSearchActor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#skeletonSearchActor', v)
+export function validateSkeletonSearchActor(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonSearchActor`,
+    v,
+  ) as ValidationResult<SkeletonSearchActor>
 }
 
 export interface SkeletonSearchStarterPack {
@@ -47,21 +51,17 @@ export interface SkeletonSearchStarterPack {
 
 export function isSkeletonSearchStarterPack(
   v: unknown,
-): v is SkeletonSearchStarterPack {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchStarterPack'
-  )
+): v is SkeletonSearchStarterPack & {
+  $type: $Type<'app.bsky.unspecced.defs', 'skeletonSearchStarterPack'>
+} {
+  return is$typed(v, id, 'skeletonSearchStarterPack')
 }
 
-export function validateSkeletonSearchStarterPack(
-  v: unknown,
-): ValidationResult {
+export function validateSkeletonSearchStarterPack(v: unknown) {
   return lexicons.validate(
-    'app.bsky.unspecced.defs#skeletonSearchStarterPack',
+    `${id}#skeletonSearchStarterPack`,
     v,
-  )
+  ) as ValidationResult<SkeletonSearchStarterPack>
 }
 
 export interface TrendingTopic {
@@ -72,14 +72,15 @@ export interface TrendingTopic {
   [k: string]: unknown
 }
 
-export function isTrendingTopic(v: unknown): v is TrendingTopic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#trendingTopic'
-  )
+export function isTrendingTopic(v: unknown): v is TrendingTopic & {
+  $type: $Type<'app.bsky.unspecced.defs', 'trendingTopic'>
+} {
+  return is$typed(v, id, 'trendingTopic')
 }
 
-export function validateTrendingTopic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#trendingTopic', v)
+export function validateTrendingTopic(v: unknown) {
+  return lexicons.validate(
+    `${id}#trendingTopic`,
+    v,
+  ) as ValidationResult<TrendingTopic>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getConfig.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getConfig.ts
index da202ab0d54..b9e45fd96ce 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getConfig.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getConfig.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.unspecced.getConfig'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
index 02f19f3cc6a..20a45bc5992 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from '../feed/defs'
 
+const id = 'app.bsky.unspecced.getPopularFeedGenerators'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
index b801fa34d72..579973036a5 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyUnspeccedDefs from './defs'
 
+const id = 'app.bsky.unspecced.getSuggestionsSkeleton'
+
 export interface QueryParams {
   /** DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking. */
   viewer?: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
index a03f442140d..25e2c3b0ea3 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.unspecced.getTaggedSuggestions'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -49,17 +51,15 @@ export interface Suggestion {
   [k: string]: unknown
 }
 
-export function isSuggestion(v: unknown): v is Suggestion {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.getTaggedSuggestions#suggestion'
-  )
+export function isSuggestion(v: unknown): v is Suggestion & {
+  $type: $Type<'app.bsky.unspecced.getTaggedSuggestions', 'suggestion'>
+} {
+  return is$typed(v, id, 'suggestion')
 }
 
-export function validateSuggestion(v: unknown): ValidationResult {
+export function validateSuggestion(v: unknown) {
   return lexicons.validate(
-    'app.bsky.unspecced.getTaggedSuggestions#suggestion',
+    `${id}#suggestion`,
     v,
-  )
+  ) as ValidationResult<Suggestion>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
index 51b78652a74..47a4ac1a5b0 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyUnspeccedDefs from './defs'
 
+const id = 'app.bsky.unspecced.getTrendingTopics'
+
 export interface QueryParams {
   /** DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking. */
   viewer?: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
index 94295f45349..b4206a089b9 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyUnspeccedDefs from './defs'
 
+const id = 'app.bsky.unspecced.searchActorsSkeleton'
+
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. For typeahead search, only simple term match is supported, not full syntax. */
   q: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
index cd293454902..16b2ff87428 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyUnspeccedDefs from './defs'
 
+const id = 'app.bsky.unspecced.searchPostsSkeleton'
+
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
   q: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts b/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
index e980d884fec..6927713a2e4 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyUnspeccedDefs from './defs'
 
+const id = 'app.bsky.unspecced.searchStarterPacksSkeleton'
+
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
   q: string
diff --git a/packages/ozone/src/lexicon/types/app/bsky/video/defs.ts b/packages/ozone/src/lexicon/types/app/bsky/video/defs.ts
index 12f4d674794..7b82931c46c 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/video/defs.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/video/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.video.defs'
 
 export interface JobStatus {
   jobId: string
@@ -19,14 +21,12 @@ export interface JobStatus {
   [k: string]: unknown
 }
 
-export function isJobStatus(v: unknown): v is JobStatus {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.video.defs#jobStatus'
-  )
+export function isJobStatus(
+  v: unknown,
+): v is JobStatus & { $type: $Type<'app.bsky.video.defs', 'jobStatus'> } {
+  return is$typed(v, id, 'jobStatus')
 }
 
-export function validateJobStatus(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.video.defs#jobStatus', v)
+export function validateJobStatus(v: unknown) {
+  return lexicons.validate(`${id}#jobStatus`, v) as ValidationResult<JobStatus>
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/video/getJobStatus.ts b/packages/ozone/src/lexicon/types/app/bsky/video/getJobStatus.ts
index 3e075ba2195..6cea4453ace 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/video/getJobStatus.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/video/getJobStatus.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyVideoDefs from './defs'
 
+const id = 'app.bsky.video.getJobStatus'
+
 export interface QueryParams {
   jobId: string
 }
diff --git a/packages/ozone/src/lexicon/types/app/bsky/video/getUploadLimits.ts b/packages/ozone/src/lexicon/types/app/bsky/video/getUploadLimits.ts
index f0f23003b0b..e1a2c8a12f8 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/video/getUploadLimits.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/video/getUploadLimits.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.video.getUploadLimits'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/ozone/src/lexicon/types/app/bsky/video/uploadVideo.ts b/packages/ozone/src/lexicon/types/app/bsky/video/uploadVideo.ts
index c23ff677a4b..85e0beeb811 100644
--- a/packages/ozone/src/lexicon/types/app/bsky/video/uploadVideo.ts
+++ b/packages/ozone/src/lexicon/types/app/bsky/video/uploadVideo.ts
@@ -4,12 +4,14 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyVideoDefs from './defs'
 
+const id = 'app.bsky.video.uploadVideo'
+
 export interface QueryParams {}
 
 export type InputSchema = string | Uint8Array | Blob
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/actor/declaration.ts b/packages/ozone/src/lexicon/types/chat/bsky/actor/declaration.ts
index b837351c1e1..454bd9edf6f 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/actor/declaration.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/actor/declaration.ts
@@ -2,24 +2,23 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'chat.bsky.actor.declaration'
 
 export interface Record {
   allowIncoming: 'all' | 'none' | 'following' | (string & {})
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'chat.bsky.actor.declaration#main' ||
-      v.$type === 'chat.bsky.actor.declaration')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'chat.bsky.actor.declaration', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.actor.declaration#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/actor/defs.ts b/packages/ozone/src/lexicon/types/chat/bsky/actor/defs.ts
index 8a05d480784..858aaa5a69e 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/actor/defs.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/actor/defs.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const id = 'chat.bsky.actor.defs'
+
 export interface ProfileViewBasic {
   did: string
   handle: string
@@ -21,14 +23,15 @@ export interface ProfileViewBasic {
   [k: string]: unknown
 }
 
-export function isProfileViewBasic(v: unknown): v is ProfileViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.actor.defs#profileViewBasic'
-  )
+export function isProfileViewBasic(v: unknown): v is ProfileViewBasic & {
+  $type: $Type<'chat.bsky.actor.defs', 'profileViewBasic'>
+} {
+  return is$typed(v, id, 'profileViewBasic')
 }
 
-export function validateProfileViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.actor.defs#profileViewBasic', v)
+export function validateProfileViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileViewBasic`,
+    v,
+  ) as ValidationResult<ProfileViewBasic>
 }
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/actor/deleteAccount.ts b/packages/ozone/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
index 08714990fcb..c45ee77d22e 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'chat.bsky.actor.deleteAccount'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/actor/exportAccountData.ts b/packages/ozone/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
index f6f38ab2fb3..aa37fb7e366 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'chat.bsky.actor.exportAccountData'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/defs.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/defs.ts
index b2452410be2..d802616974a 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/defs.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/defs.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyRichtextFacet from '../../../app/bsky/richtext/facet'
 import * as AppBskyEmbedRecord from '../../../app/bsky/embed/record'
 import * as ChatBskyActorDefs from '../actor/defs'
 
+const id = 'chat.bsky.convo.defs'
+
 export interface MessageRef {
   did: string
   convoId: string
@@ -16,16 +18,17 @@ export interface MessageRef {
   [k: string]: unknown
 }
 
-export function isMessageRef(v: unknown): v is MessageRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageRef'
-  )
+export function isMessageRef(
+  v: unknown,
+): v is MessageRef & { $type: $Type<'chat.bsky.convo.defs', 'messageRef'> } {
+  return is$typed(v, id, 'messageRef')
 }
 
-export function validateMessageRef(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageRef', v)
+export function validateMessageRef(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageRef`,
+    v,
+  ) as ValidationResult<MessageRef>
 }
 
 export interface MessageInput {
@@ -36,16 +39,17 @@ export interface MessageInput {
   [k: string]: unknown
 }
 
-export function isMessageInput(v: unknown): v is MessageInput {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageInput'
-  )
+export function isMessageInput(v: unknown): v is MessageInput & {
+  $type: $Type<'chat.bsky.convo.defs', 'messageInput'>
+} {
+  return is$typed(v, id, 'messageInput')
 }
 
-export function validateMessageInput(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageInput', v)
+export function validateMessageInput(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageInput`,
+    v,
+  ) as ValidationResult<MessageInput>
 }
 
 export interface MessageView {
@@ -60,16 +64,17 @@ export interface MessageView {
   [k: string]: unknown
 }
 
-export function isMessageView(v: unknown): v is MessageView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageView'
-  )
+export function isMessageView(
+  v: unknown,
+): v is MessageView & { $type: $Type<'chat.bsky.convo.defs', 'messageView'> } {
+  return is$typed(v, id, 'messageView')
 }
 
-export function validateMessageView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageView', v)
+export function validateMessageView(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageView`,
+    v,
+  ) as ValidationResult<MessageView>
 }
 
 export interface DeletedMessageView {
@@ -80,16 +85,17 @@ export interface DeletedMessageView {
   [k: string]: unknown
 }
 
-export function isDeletedMessageView(v: unknown): v is DeletedMessageView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#deletedMessageView'
-  )
+export function isDeletedMessageView(v: unknown): v is DeletedMessageView & {
+  $type: $Type<'chat.bsky.convo.defs', 'deletedMessageView'>
+} {
+  return is$typed(v, id, 'deletedMessageView')
 }
 
-export function validateDeletedMessageView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#deletedMessageView', v)
+export function validateDeletedMessageView(v: unknown) {
+  return lexicons.validate(
+    `${id}#deletedMessageView`,
+    v,
+  ) as ValidationResult<DeletedMessageView>
 }
 
 export interface MessageViewSender {
@@ -97,16 +103,17 @@ export interface MessageViewSender {
   [k: string]: unknown
 }
 
-export function isMessageViewSender(v: unknown): v is MessageViewSender {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageViewSender'
-  )
+export function isMessageViewSender(v: unknown): v is MessageViewSender & {
+  $type: $Type<'chat.bsky.convo.defs', 'messageViewSender'>
+} {
+  return is$typed(v, id, 'messageViewSender')
 }
 
-export function validateMessageViewSender(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageViewSender', v)
+export function validateMessageViewSender(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageViewSender`,
+    v,
+  ) as ValidationResult<MessageViewSender>
 }
 
 export interface ConvoView {
@@ -123,16 +130,14 @@ export interface ConvoView {
   [k: string]: unknown
 }
 
-export function isConvoView(v: unknown): v is ConvoView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#convoView'
-  )
+export function isConvoView(
+  v: unknown,
+): v is ConvoView & { $type: $Type<'chat.bsky.convo.defs', 'convoView'> } {
+  return is$typed(v, id, 'convoView')
 }
 
-export function validateConvoView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#convoView', v)
+export function validateConvoView(v: unknown) {
+  return lexicons.validate(`${id}#convoView`, v) as ValidationResult<ConvoView>
 }
 
 export interface LogBeginConvo {
@@ -141,16 +146,17 @@ export interface LogBeginConvo {
   [k: string]: unknown
 }
 
-export function isLogBeginConvo(v: unknown): v is LogBeginConvo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logBeginConvo'
-  )
+export function isLogBeginConvo(v: unknown): v is LogBeginConvo & {
+  $type: $Type<'chat.bsky.convo.defs', 'logBeginConvo'>
+} {
+  return is$typed(v, id, 'logBeginConvo')
 }
 
-export function validateLogBeginConvo(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logBeginConvo', v)
+export function validateLogBeginConvo(v: unknown) {
+  return lexicons.validate(
+    `${id}#logBeginConvo`,
+    v,
+  ) as ValidationResult<LogBeginConvo>
 }
 
 export interface LogLeaveConvo {
@@ -159,16 +165,17 @@ export interface LogLeaveConvo {
   [k: string]: unknown
 }
 
-export function isLogLeaveConvo(v: unknown): v is LogLeaveConvo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logLeaveConvo'
-  )
+export function isLogLeaveConvo(v: unknown): v is LogLeaveConvo & {
+  $type: $Type<'chat.bsky.convo.defs', 'logLeaveConvo'>
+} {
+  return is$typed(v, id, 'logLeaveConvo')
 }
 
-export function validateLogLeaveConvo(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logLeaveConvo', v)
+export function validateLogLeaveConvo(v: unknown) {
+  return lexicons.validate(
+    `${id}#logLeaveConvo`,
+    v,
+  ) as ValidationResult<LogLeaveConvo>
 }
 
 export interface LogCreateMessage {
@@ -181,16 +188,17 @@ export interface LogCreateMessage {
   [k: string]: unknown
 }
 
-export function isLogCreateMessage(v: unknown): v is LogCreateMessage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logCreateMessage'
-  )
+export function isLogCreateMessage(v: unknown): v is LogCreateMessage & {
+  $type: $Type<'chat.bsky.convo.defs', 'logCreateMessage'>
+} {
+  return is$typed(v, id, 'logCreateMessage')
 }
 
-export function validateLogCreateMessage(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logCreateMessage', v)
+export function validateLogCreateMessage(v: unknown) {
+  return lexicons.validate(
+    `${id}#logCreateMessage`,
+    v,
+  ) as ValidationResult<LogCreateMessage>
 }
 
 export interface LogDeleteMessage {
@@ -203,14 +211,15 @@ export interface LogDeleteMessage {
   [k: string]: unknown
 }
 
-export function isLogDeleteMessage(v: unknown): v is LogDeleteMessage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logDeleteMessage'
-  )
+export function isLogDeleteMessage(v: unknown): v is LogDeleteMessage & {
+  $type: $Type<'chat.bsky.convo.defs', 'logDeleteMessage'>
+} {
+  return is$typed(v, id, 'logDeleteMessage')
 }
 
-export function validateLogDeleteMessage(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logDeleteMessage', v)
+export function validateLogDeleteMessage(v: unknown) {
+  return lexicons.validate(
+    `${id}#logDeleteMessage`,
+    v,
+  ) as ValidationResult<LogDeleteMessage>
 }
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
index c05bc99b36a..4364c075ecd 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.deleteMessageForSelf'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvo.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvo.ts
index 1448c75b306..7563c777197 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvo.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvo.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.getConvo'
+
 export interface QueryParams {
   convoId: string
 }
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
index 108dfd6ad5b..d7a1a69bb13 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.getConvoForMembers'
+
 export interface QueryParams {
   members: string[]
 }
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/getLog.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/getLog.ts
index 89f6778c4d3..47f28623631 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/getLog.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/getLog.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.getLog'
+
 export interface QueryParams {
   cursor?: string
 }
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/getMessages.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/getMessages.ts
index a615ba37674..68f9331fdef 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/getMessages.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/getMessages.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.getMessages'
+
 export interface QueryParams {
   convoId: string
   limit: number
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/leaveConvo.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
index 8b76a7b0c75..67a3e3a141c 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'chat.bsky.convo.leaveConvo'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/listConvos.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/listConvos.ts
index 4d6f35bf39c..5829bd5b899 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/listConvos.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/listConvos.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.listConvos'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/muteConvo.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/muteConvo.ts
index ddb57623913..c12e1df0238 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/muteConvo.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/muteConvo.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.muteConvo'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessage.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessage.ts
index ab2d8b03f89..6ac463db74c 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessage.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessage.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.sendMessage'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
index b3c2c2bc252..bc5291bbcf3 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.sendMessageBatch'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -55,14 +57,12 @@ export interface BatchItem {
   [k: string]: unknown
 }
 
-export function isBatchItem(v: unknown): v is BatchItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.sendMessageBatch#batchItem'
-  )
+export function isBatchItem(v: unknown): v is BatchItem & {
+  $type: $Type<'chat.bsky.convo.sendMessageBatch', 'batchItem'>
+} {
+  return is$typed(v, id, 'batchItem')
 }
 
-export function validateBatchItem(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.sendMessageBatch#batchItem', v)
+export function validateBatchItem(v: unknown) {
+  return lexicons.validate(`${id}#batchItem`, v) as ValidationResult<BatchItem>
 }
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
index ddb57623913..03188d2bbd2 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.unmuteConvo'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/convo/updateRead.ts b/packages/ozone/src/lexicon/types/chat/bsky/convo/updateRead.ts
index b879cde82b0..8b7440714c0 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/convo/updateRead.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/convo/updateRead.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.updateRead'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts b/packages/ozone/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
index 077a0076bab..2fd8e512d18 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'chat.bsky.moderation.getActorMetadata'
+
 export interface QueryParams {
   actor: string
 }
@@ -54,14 +56,12 @@ export interface Metadata {
   [k: string]: unknown
 }
 
-export function isMetadata(v: unknown): v is Metadata {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.moderation.getActorMetadata#metadata'
-  )
+export function isMetadata(v: unknown): v is Metadata & {
+  $type: $Type<'chat.bsky.moderation.getActorMetadata', 'metadata'>
+} {
+  return is$typed(v, id, 'metadata')
 }
 
-export function validateMetadata(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.moderation.getActorMetadata#metadata', v)
+export function validateMetadata(v: unknown) {
+  return lexicons.validate(`${id}#metadata`, v) as ValidationResult<Metadata>
 }
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts b/packages/ozone/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
index 0a1f5b1b691..a24045586b0 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from '../convo/defs'
 
+const id = 'chat.bsky.moderation.getMessageContext'
+
 export interface QueryParams {
   /** Conversation that the message is from. NOTE: this field will eventually be required. */
   convoId?: string
diff --git a/packages/ozone/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts b/packages/ozone/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
index d9c95f69643..2493a8063be 100644
--- a/packages/ozone/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
+++ b/packages/ozone/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'chat.bsky.moderation.updateActorAccess'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/defs.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/defs.ts
index f58b7c7ece4..8b0e016c078 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/defs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/defs.ts
@@ -2,27 +2,30 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as ComAtprotoServerDefs from '../server/defs'
 
+const id = 'com.atproto.admin.defs'
+
 export interface StatusAttr {
   applied: boolean
   ref?: string
   [k: string]: unknown
 }
 
-export function isStatusAttr(v: unknown): v is StatusAttr {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#statusAttr'
-  )
+export function isStatusAttr(
+  v: unknown,
+): v is StatusAttr & { $type: $Type<'com.atproto.admin.defs', 'statusAttr'> } {
+  return is$typed(v, id, 'statusAttr')
 }
 
-export function validateStatusAttr(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#statusAttr', v)
+export function validateStatusAttr(v: unknown) {
+  return lexicons.validate(
+    `${id}#statusAttr`,
+    v,
+  ) as ValidationResult<StatusAttr>
 }
 
 export interface AccountView {
@@ -41,16 +44,17 @@ export interface AccountView {
   [k: string]: unknown
 }
 
-export function isAccountView(v: unknown): v is AccountView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#accountView'
-  )
+export function isAccountView(v: unknown): v is AccountView & {
+  $type: $Type<'com.atproto.admin.defs', 'accountView'>
+} {
+  return is$typed(v, id, 'accountView')
 }
 
-export function validateAccountView(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#accountView', v)
+export function validateAccountView(v: unknown) {
+  return lexicons.validate(
+    `${id}#accountView`,
+    v,
+  ) as ValidationResult<AccountView>
 }
 
 export interface RepoRef {
@@ -58,16 +62,14 @@ export interface RepoRef {
   [k: string]: unknown
 }
 
-export function isRepoRef(v: unknown): v is RepoRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#repoRef'
-  )
+export function isRepoRef(
+  v: unknown,
+): v is RepoRef & { $type: $Type<'com.atproto.admin.defs', 'repoRef'> } {
+  return is$typed(v, id, 'repoRef')
 }
 
-export function validateRepoRef(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#repoRef', v)
+export function validateRepoRef(v: unknown) {
+  return lexicons.validate(`${id}#repoRef`, v) as ValidationResult<RepoRef>
 }
 
 export interface RepoBlobRef {
@@ -77,16 +79,17 @@ export interface RepoBlobRef {
   [k: string]: unknown
 }
 
-export function isRepoBlobRef(v: unknown): v is RepoBlobRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#repoBlobRef'
-  )
+export function isRepoBlobRef(v: unknown): v is RepoBlobRef & {
+  $type: $Type<'com.atproto.admin.defs', 'repoBlobRef'>
+} {
+  return is$typed(v, id, 'repoBlobRef')
 }
 
-export function validateRepoBlobRef(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#repoBlobRef', v)
+export function validateRepoBlobRef(v: unknown) {
+  return lexicons.validate(
+    `${id}#repoBlobRef`,
+    v,
+  ) as ValidationResult<RepoBlobRef>
 }
 
 export interface ThreatSignature {
@@ -95,14 +98,15 @@ export interface ThreatSignature {
   [k: string]: unknown
 }
 
-export function isThreatSignature(v: unknown): v is ThreatSignature {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#threatSignature'
-  )
+export function isThreatSignature(v: unknown): v is ThreatSignature & {
+  $type: $Type<'com.atproto.admin.defs', 'threatSignature'>
+} {
+  return is$typed(v, id, 'threatSignature')
 }
 
-export function validateThreatSignature(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#threatSignature', v)
+export function validateThreatSignature(v: unknown) {
+  return lexicons.validate(
+    `${id}#threatSignature`,
+    v,
+  ) as ValidationResult<ThreatSignature>
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/deleteAccount.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/deleteAccount.ts
index 003c1b5ebcd..1acca2e1dab 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/deleteAccount.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/deleteAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.admin.deleteAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
index 68c6503d95e..d36f19ceb36 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.admin.disableAccountInvites'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
index 2bf8de35583..9a9db8e9659 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.admin.disableInviteCodes'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
index 3f2836e7142..a9e226a8e5d 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.admin.enableAccountInvites'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfo.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
index c7b840a153d..0cf60326ea3 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 
+const id = 'com.atproto.admin.getAccountInfo'
+
 export interface QueryParams {
   did: string
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfos.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
index 99ef44a99f5..fb5c83de25a 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 
+const id = 'com.atproto.admin.getAccountInfos'
+
 export interface QueryParams {
   dids: string[]
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/getInviteCodes.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
index d68b97d775a..80d9487ee8b 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoServerDefs from '../server/defs'
 
+const id = 'com.atproto.admin.getInviteCodes'
+
 export interface QueryParams {
   sort: 'recent' | 'usage' | (string & {})
   limit: number
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
index c13496638c8..21448f88d6b 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
@@ -3,13 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+const id = 'com.atproto.admin.getSubjectStatus'
+
 export interface QueryParams {
   did?: string
   uri?: string
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/searchAccounts.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/searchAccounts.ts
index 80d0eecd926..6a554d7c424 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/searchAccounts.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/searchAccounts.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 
+const id = 'com.atproto.admin.searchAccounts'
+
 export interface QueryParams {
   email?: string
   cursor?: string
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/sendEmail.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/sendEmail.ts
index 836fba39f79..baad3c1ee1f 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/sendEmail.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/sendEmail.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.admin.sendEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
index ebabffbccdb..e3aed0b58c9 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.admin.updateAccountEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
index d6dc4a2dc25..67c54a3b9de 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.admin.updateAccountHandle'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
index 948568f0d3d..c05879469c4 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.admin.updateAccountPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts b/packages/ozone/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
index c03d9667cae..e6630229fc0 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
@@ -3,13 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+const id = 'com.atproto.admin.updateSubjectStatus'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
index 5fa374de737..56ae83a87d4 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.identity.getRecommendedDidCredentials'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
index 82672f1d1c7..b687f9d01bc 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.identity.requestPlcOperationSignature'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/resolveHandle.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/resolveHandle.ts
index 05019df6166..c9e880b7cee 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/resolveHandle.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/resolveHandle.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.identity.resolveHandle'
+
 export interface QueryParams {
   /** The handle to resolve. */
   handle: string
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/signPlcOperation.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
index 3c908c049f2..c648e5b7ddf 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.identity.signPlcOperation'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
index 5290b55d023..3af1814148c 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.identity.submitPlcOperation'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/identity/updateHandle.ts b/packages/ozone/src/lexicon/types/com/atproto/identity/updateHandle.ts
index f451d1f57c7..c54d951e25d 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/identity/updateHandle.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/identity/updateHandle.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.identity.updateHandle'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/label/defs.ts b/packages/ozone/src/lexicon/types/com/atproto/label/defs.ts
index 348e985622b..8b0bc71b198 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/label/defs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/label/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'com.atproto.label.defs'
 
 /** Metadata tag on an atproto resource (eg, repo or record). */
 export interface Label {
@@ -29,16 +31,14 @@ export interface Label {
   [k: string]: unknown
 }
 
-export function isLabel(v: unknown): v is Label {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#label'
-  )
+export function isLabel(
+  v: unknown,
+): v is Label & { $type: $Type<'com.atproto.label.defs', 'label'> } {
+  return is$typed(v, id, 'label')
 }
 
-export function validateLabel(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#label', v)
+export function validateLabel(v: unknown) {
+  return lexicons.validate(`${id}#label`, v) as ValidationResult<Label>
 }
 
 /** Metadata tags on an atproto record, published by the author within the record. */
@@ -47,16 +47,17 @@ export interface SelfLabels {
   [k: string]: unknown
 }
 
-export function isSelfLabels(v: unknown): v is SelfLabels {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#selfLabels'
-  )
+export function isSelfLabels(
+  v: unknown,
+): v is SelfLabels & { $type: $Type<'com.atproto.label.defs', 'selfLabels'> } {
+  return is$typed(v, id, 'selfLabels')
 }
 
-export function validateSelfLabels(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#selfLabels', v)
+export function validateSelfLabels(v: unknown) {
+  return lexicons.validate(
+    `${id}#selfLabels`,
+    v,
+  ) as ValidationResult<SelfLabels>
 }
 
 /** Metadata tag on an atproto record, published by the author within the record. Note that schemas should use #selfLabels, not #selfLabel. */
@@ -66,16 +67,14 @@ export interface SelfLabel {
   [k: string]: unknown
 }
 
-export function isSelfLabel(v: unknown): v is SelfLabel {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#selfLabel'
-  )
+export function isSelfLabel(
+  v: unknown,
+): v is SelfLabel & { $type: $Type<'com.atproto.label.defs', 'selfLabel'> } {
+  return is$typed(v, id, 'selfLabel')
 }
 
-export function validateSelfLabel(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#selfLabel', v)
+export function validateSelfLabel(v: unknown) {
+  return lexicons.validate(`${id}#selfLabel`, v) as ValidationResult<SelfLabel>
 }
 
 /** Declares a label value and its expected interpretations and behaviors. */
@@ -94,16 +93,19 @@ export interface LabelValueDefinition {
   [k: string]: unknown
 }
 
-export function isLabelValueDefinition(v: unknown): v is LabelValueDefinition {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#labelValueDefinition'
-  )
+export function isLabelValueDefinition(
+  v: unknown,
+): v is LabelValueDefinition & {
+  $type: $Type<'com.atproto.label.defs', 'labelValueDefinition'>
+} {
+  return is$typed(v, id, 'labelValueDefinition')
 }
 
-export function validateLabelValueDefinition(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#labelValueDefinition', v)
+export function validateLabelValueDefinition(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelValueDefinition`,
+    v,
+  ) as ValidationResult<LabelValueDefinition>
 }
 
 /** Strings which describe the label in the UI, localized into a specific language. */
@@ -119,21 +121,17 @@ export interface LabelValueDefinitionStrings {
 
 export function isLabelValueDefinitionStrings(
   v: unknown,
-): v is LabelValueDefinitionStrings {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#labelValueDefinitionStrings'
-  )
+): v is LabelValueDefinitionStrings & {
+  $type: $Type<'com.atproto.label.defs', 'labelValueDefinitionStrings'>
+} {
+  return is$typed(v, id, 'labelValueDefinitionStrings')
 }
 
-export function validateLabelValueDefinitionStrings(
-  v: unknown,
-): ValidationResult {
+export function validateLabelValueDefinitionStrings(v: unknown) {
   return lexicons.validate(
-    'com.atproto.label.defs#labelValueDefinitionStrings',
+    `${id}#labelValueDefinitionStrings`,
     v,
-  )
+  ) as ValidationResult<LabelValueDefinitionStrings>
 }
 
 export type LabelValue =
diff --git a/packages/ozone/src/lexicon/types/com/atproto/label/queryLabels.ts b/packages/ozone/src/lexicon/types/com/atproto/label/queryLabels.ts
index 0c9d55a6961..62d114a2685 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/label/queryLabels.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/label/queryLabels.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoLabelDefs from './defs'
 
+const id = 'com.atproto.label.queryLabels'
+
 export interface QueryParams {
   /** List of AT URI patterns to match (boolean 'OR'). Each may be a prefix (ending with '*'; will match inclusive of the string leading to '*'), or a full URI. */
   uriPatterns: string[]
diff --git a/packages/ozone/src/lexicon/types/com/atproto/label/subscribeLabels.ts b/packages/ozone/src/lexicon/types/com/atproto/label/subscribeLabels.ts
index 6034b35d895..f84267b7075 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/label/subscribeLabels.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/label/subscribeLabels.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, ErrorFrame } from '@atproto/xrpc-server'
 import { IncomingMessage } from 'http'
 import * as ComAtprotoLabelDefs from './defs'
 
+const id = 'com.atproto.label.subscribeLabels'
+
 export interface QueryParams {
   /** The last known event seq number to backfill from. */
   cursor?: number
@@ -36,16 +38,14 @@ export interface Labels {
   [k: string]: unknown
 }
 
-export function isLabels(v: unknown): v is Labels {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.subscribeLabels#labels'
-  )
+export function isLabels(v: unknown): v is Labels & {
+  $type: $Type<'com.atproto.label.subscribeLabels', 'labels'>
+} {
+  return is$typed(v, id, 'labels')
 }
 
-export function validateLabels(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.subscribeLabels#labels', v)
+export function validateLabels(v: unknown) {
+  return lexicons.validate(`${id}#labels`, v) as ValidationResult<Labels>
 }
 
 export interface Info {
@@ -54,14 +54,12 @@ export interface Info {
   [k: string]: unknown
 }
 
-export function isInfo(v: unknown): v is Info {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.subscribeLabels#info'
-  )
+export function isInfo(
+  v: unknown,
+): v is Info & { $type: $Type<'com.atproto.label.subscribeLabels', 'info'> } {
+  return is$typed(v, id, 'info')
 }
 
-export function validateInfo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.subscribeLabels#info', v)
+export function validateInfo(v: unknown) {
+  return lexicons.validate(`${id}#info`, v) as ValidationResult<Info>
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/moderation/createReport.ts b/packages/ozone/src/lexicon/types/com/atproto/moderation/createReport.ts
index aa3f810a91c..5095d72d1fe 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/moderation/createReport.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/moderation/createReport.ts
@@ -3,14 +3,16 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoModerationDefs from './defs'
 import * as ComAtprotoAdminDefs from '../admin/defs'
 import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+const id = 'com.atproto.moderation.createReport'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/moderation/defs.ts b/packages/ozone/src/lexicon/types/com/atproto/moderation/defs.ts
index 08e555c2422..ed67a387dd5 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/moderation/defs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/moderation/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'com.atproto.moderation.defs'
 
 export type ReasonType =
   | 'com.atproto.moderation.defs#reasonSpam'
@@ -17,16 +19,16 @@ export type ReasonType =
   | (string & {})
 
 /** Spam: frequent unwanted promotion, replies, mentions */
-export const REASONSPAM = 'com.atproto.moderation.defs#reasonSpam'
+export const REASONSPAM = `${id}#reasonSpam`
 /** Direct violation of server rules, laws, terms of service */
-export const REASONVIOLATION = 'com.atproto.moderation.defs#reasonViolation'
+export const REASONVIOLATION = `${id}#reasonViolation`
 /** Misleading identity, affiliation, or content */
-export const REASONMISLEADING = 'com.atproto.moderation.defs#reasonMisleading'
+export const REASONMISLEADING = `${id}#reasonMisleading`
 /** Unwanted or mislabeled sexual content */
-export const REASONSEXUAL = 'com.atproto.moderation.defs#reasonSexual'
+export const REASONSEXUAL = `${id}#reasonSexual`
 /** Rude, harassing, explicit, or otherwise unwelcoming behavior */
-export const REASONRUDE = 'com.atproto.moderation.defs#reasonRude'
+export const REASONRUDE = `${id}#reasonRude`
 /** Other: reports not falling under another report category */
-export const REASONOTHER = 'com.atproto.moderation.defs#reasonOther'
+export const REASONOTHER = `${id}#reasonOther`
 /** Appeal: appeal a previously taken moderation action */
-export const REASONAPPEAL = 'com.atproto.moderation.defs#reasonAppeal'
+export const REASONAPPEAL = `${id}#reasonAppeal`
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/applyWrites.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/applyWrites.ts
index 4e3c8dcef3d..9e171a111c5 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/applyWrites.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/applyWrites.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoRepoDefs from './defs'
 
+const id = 'com.atproto.repo.applyWrites'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -65,16 +67,14 @@ export interface Create {
   [k: string]: unknown
 }
 
-export function isCreate(v: unknown): v is Create {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#create'
-  )
+export function isCreate(
+  v: unknown,
+): v is Create & { $type: $Type<'com.atproto.repo.applyWrites', 'create'> } {
+  return is$typed(v, id, 'create')
 }
 
-export function validateCreate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#create', v)
+export function validateCreate(v: unknown) {
+  return lexicons.validate(`${id}#create`, v) as ValidationResult<Create>
 }
 
 /** Operation which updates an existing record. */
@@ -85,16 +85,14 @@ export interface Update {
   [k: string]: unknown
 }
 
-export function isUpdate(v: unknown): v is Update {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#update'
-  )
+export function isUpdate(
+  v: unknown,
+): v is Update & { $type: $Type<'com.atproto.repo.applyWrites', 'update'> } {
+  return is$typed(v, id, 'update')
 }
 
-export function validateUpdate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#update', v)
+export function validateUpdate(v: unknown) {
+  return lexicons.validate(`${id}#update`, v) as ValidationResult<Update>
 }
 
 /** Operation which deletes an existing record. */
@@ -104,16 +102,14 @@ export interface Delete {
   [k: string]: unknown
 }
 
-export function isDelete(v: unknown): v is Delete {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#delete'
-  )
+export function isDelete(
+  v: unknown,
+): v is Delete & { $type: $Type<'com.atproto.repo.applyWrites', 'delete'> } {
+  return is$typed(v, id, 'delete')
 }
 
-export function validateDelete(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#delete', v)
+export function validateDelete(v: unknown) {
+  return lexicons.validate(`${id}#delete`, v) as ValidationResult<Delete>
 }
 
 export interface CreateResult {
@@ -123,16 +119,17 @@ export interface CreateResult {
   [k: string]: unknown
 }
 
-export function isCreateResult(v: unknown): v is CreateResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#createResult'
-  )
+export function isCreateResult(v: unknown): v is CreateResult & {
+  $type: $Type<'com.atproto.repo.applyWrites', 'createResult'>
+} {
+  return is$typed(v, id, 'createResult')
 }
 
-export function validateCreateResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#createResult', v)
+export function validateCreateResult(v: unknown) {
+  return lexicons.validate(
+    `${id}#createResult`,
+    v,
+  ) as ValidationResult<CreateResult>
 }
 
 export interface UpdateResult {
@@ -142,30 +139,32 @@ export interface UpdateResult {
   [k: string]: unknown
 }
 
-export function isUpdateResult(v: unknown): v is UpdateResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#updateResult'
-  )
+export function isUpdateResult(v: unknown): v is UpdateResult & {
+  $type: $Type<'com.atproto.repo.applyWrites', 'updateResult'>
+} {
+  return is$typed(v, id, 'updateResult')
 }
 
-export function validateUpdateResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#updateResult', v)
+export function validateUpdateResult(v: unknown) {
+  return lexicons.validate(
+    `${id}#updateResult`,
+    v,
+  ) as ValidationResult<UpdateResult>
 }
 
 export interface DeleteResult {
   [k: string]: unknown
 }
 
-export function isDeleteResult(v: unknown): v is DeleteResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#deleteResult'
-  )
+export function isDeleteResult(v: unknown): v is DeleteResult & {
+  $type: $Type<'com.atproto.repo.applyWrites', 'deleteResult'>
+} {
+  return is$typed(v, id, 'deleteResult')
 }
 
-export function validateDeleteResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#deleteResult', v)
+export function validateDeleteResult(v: unknown) {
+  return lexicons.validate(
+    `${id}#deleteResult`,
+    v,
+  ) as ValidationResult<DeleteResult>
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/createRecord.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/createRecord.ts
index 5cac0848bf1..b155d82b176 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/createRecord.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/createRecord.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoRepoDefs from './defs'
 
+const id = 'com.atproto.repo.createRecord'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/defs.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/defs.ts
index 8357fe2a611..eeb0b484b7e 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/defs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'com.atproto.repo.defs'
 
 export interface CommitMeta {
   cid: string
@@ -12,14 +14,15 @@ export interface CommitMeta {
   [k: string]: unknown
 }
 
-export function isCommitMeta(v: unknown): v is CommitMeta {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.defs#commitMeta'
-  )
+export function isCommitMeta(
+  v: unknown,
+): v is CommitMeta & { $type: $Type<'com.atproto.repo.defs', 'commitMeta'> } {
+  return is$typed(v, id, 'commitMeta')
 }
 
-export function validateCommitMeta(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.defs#commitMeta', v)
+export function validateCommitMeta(v: unknown) {
+  return lexicons.validate(
+    `${id}#commitMeta`,
+    v,
+  ) as ValidationResult<CommitMeta>
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/deleteRecord.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/deleteRecord.ts
index e594cd00adf..f285caa3e28 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/deleteRecord.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/deleteRecord.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoRepoDefs from './defs'
 
+const id = 'com.atproto.repo.deleteRecord'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/describeRepo.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/describeRepo.ts
index 749bedcfeb7..b3774866513 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/describeRepo.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/describeRepo.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.repo.describeRepo'
+
 export interface QueryParams {
   /** The handle or DID of the repo. */
   repo: string
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/getRecord.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/getRecord.ts
index 9d03da19530..ff0baecfadd 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/getRecord.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/getRecord.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.repo.getRecord'
+
 export interface QueryParams {
   /** The handle or DID of the repo. */
   repo: string
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/importRepo.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/importRepo.ts
index 59288c7a027..3dfc0334549 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/importRepo.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/importRepo.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.repo.importRepo'
+
 export interface QueryParams {}
 
 export type InputSchema = string | Uint8Array | Blob
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
index 40f4d385e47..e79f4d6a71e 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.repo.listMissingBlobs'
+
 export interface QueryParams {
   limit: number
   cursor?: string
@@ -52,14 +54,15 @@ export interface RecordBlob {
   [k: string]: unknown
 }
 
-export function isRecordBlob(v: unknown): v is RecordBlob {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.listMissingBlobs#recordBlob'
-  )
+export function isRecordBlob(v: unknown): v is RecordBlob & {
+  $type: $Type<'com.atproto.repo.listMissingBlobs', 'recordBlob'>
+} {
+  return is$typed(v, id, 'recordBlob')
 }
 
-export function validateRecordBlob(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.listMissingBlobs#recordBlob', v)
+export function validateRecordBlob(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordBlob`,
+    v,
+  ) as ValidationResult<RecordBlob>
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/listRecords.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/listRecords.ts
index f46f6eb0f7f..51b1393b9a8 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/listRecords.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/listRecords.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.repo.listRecords'
+
 export interface QueryParams {
   /** The handle or DID of the repo. */
   repo: string
@@ -64,14 +66,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.listRecords#record'
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'com.atproto.repo.listRecords', 'record'> } {
+  return is$typed(v, id, 'record')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.listRecords#record', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#record`, v) as ValidationResult<Record>
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/putRecord.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/putRecord.ts
index 5cde768d7c2..427fcd8920d 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/putRecord.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/putRecord.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoRepoDefs from './defs'
 
+const id = 'com.atproto.repo.putRecord'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/strongRef.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/strongRef.ts
index 8b21a6ddf81..a9298dcbe55 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/strongRef.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/strongRef.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'com.atproto.repo.strongRef'
 
 export interface Main {
   uri: string
@@ -12,15 +14,12 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'com.atproto.repo.strongRef#main' ||
-      v.$type === 'com.atproto.repo.strongRef')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: $Type<'com.atproto.repo.strongRef', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.strongRef#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/repo/uploadBlob.ts b/packages/ozone/src/lexicon/types/com/atproto/repo/uploadBlob.ts
index 4a712346a0b..7fc4618b664 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/repo/uploadBlob.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/repo/uploadBlob.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.repo.uploadBlob'
+
 export interface QueryParams {}
 
 export type InputSchema = string | Uint8Array | Blob
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/activateAccount.ts b/packages/ozone/src/lexicon/types/com/atproto/server/activateAccount.ts
index 82672f1d1c7..886a33d1e19 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/activateAccount.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/activateAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.activateAccount'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/checkAccountStatus.ts b/packages/ozone/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
index f17182a8dce..730ec6aca5b 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.checkAccountStatus'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/confirmEmail.ts b/packages/ozone/src/lexicon/types/com/atproto/server/confirmEmail.ts
index b667a04b996..f681b0a1e2f 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/confirmEmail.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/confirmEmail.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.confirmEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/createAccount.ts b/packages/ozone/src/lexicon/types/com/atproto/server/createAccount.ts
index 6e9b2f9f3c2..bd033e64df2 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/createAccount.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/createAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.createAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/createAppPassword.ts b/packages/ozone/src/lexicon/types/com/atproto/server/createAppPassword.ts
index 00657a2058f..98a4ce7f174 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/createAppPassword.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/createAppPassword.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.createAppPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -57,17 +59,15 @@ export interface AppPassword {
   [k: string]: unknown
 }
 
-export function isAppPassword(v: unknown): v is AppPassword {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.createAppPassword#appPassword'
-  )
+export function isAppPassword(v: unknown): v is AppPassword & {
+  $type: $Type<'com.atproto.server.createAppPassword', 'appPassword'>
+} {
+  return is$typed(v, id, 'appPassword')
 }
 
-export function validateAppPassword(v: unknown): ValidationResult {
+export function validateAppPassword(v: unknown) {
   return lexicons.validate(
-    'com.atproto.server.createAppPassword#appPassword',
+    `${id}#appPassword`,
     v,
-  )
+  ) as ValidationResult<AppPassword>
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCode.ts b/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCode.ts
index 9cfeacc7e28..27150f98e8a 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCode.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCode.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.createInviteCode'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCodes.ts b/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCodes.ts
index eb6cd2bb1b1..32719ec8d85 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCodes.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/createInviteCodes.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.createInviteCodes'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -56,17 +58,15 @@ export interface AccountCodes {
   [k: string]: unknown
 }
 
-export function isAccountCodes(v: unknown): v is AccountCodes {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.createInviteCodes#accountCodes'
-  )
+export function isAccountCodes(v: unknown): v is AccountCodes & {
+  $type: $Type<'com.atproto.server.createInviteCodes', 'accountCodes'>
+} {
+  return is$typed(v, id, 'accountCodes')
 }
 
-export function validateAccountCodes(v: unknown): ValidationResult {
+export function validateAccountCodes(v: unknown) {
   return lexicons.validate(
-    'com.atproto.server.createInviteCodes#accountCodes',
+    `${id}#accountCodes`,
     v,
-  )
+  ) as ValidationResult<AccountCodes>
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/createSession.ts b/packages/ozone/src/lexicon/types/com/atproto/server/createSession.ts
index 96f7d79d5bc..8d846520ae9 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/createSession.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/createSession.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.createSession'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/deactivateAccount.ts b/packages/ozone/src/lexicon/types/com/atproto/server/deactivateAccount.ts
index b3793d6b2e0..126255afd0d 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/deactivateAccount.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/deactivateAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.deactivateAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/defs.ts b/packages/ozone/src/lexicon/types/com/atproto/server/defs.ts
index 9bd67c9d7a5..e16c0153d90 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/defs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'com.atproto.server.defs'
 
 export interface InviteCode {
   code: string
@@ -17,16 +19,17 @@ export interface InviteCode {
   [k: string]: unknown
 }
 
-export function isInviteCode(v: unknown): v is InviteCode {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.defs#inviteCode'
-  )
+export function isInviteCode(
+  v: unknown,
+): v is InviteCode & { $type: $Type<'com.atproto.server.defs', 'inviteCode'> } {
+  return is$typed(v, id, 'inviteCode')
 }
 
-export function validateInviteCode(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.defs#inviteCode', v)
+export function validateInviteCode(v: unknown) {
+  return lexicons.validate(
+    `${id}#inviteCode`,
+    v,
+  ) as ValidationResult<InviteCode>
 }
 
 export interface InviteCodeUse {
@@ -35,14 +38,15 @@ export interface InviteCodeUse {
   [k: string]: unknown
 }
 
-export function isInviteCodeUse(v: unknown): v is InviteCodeUse {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.defs#inviteCodeUse'
-  )
+export function isInviteCodeUse(v: unknown): v is InviteCodeUse & {
+  $type: $Type<'com.atproto.server.defs', 'inviteCodeUse'>
+} {
+  return is$typed(v, id, 'inviteCodeUse')
 }
 
-export function validateInviteCodeUse(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.defs#inviteCodeUse', v)
+export function validateInviteCodeUse(v: unknown) {
+  return lexicons.validate(
+    `${id}#inviteCodeUse`,
+    v,
+  ) as ValidationResult<InviteCodeUse>
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/deleteAccount.ts b/packages/ozone/src/lexicon/types/com/atproto/server/deleteAccount.ts
index 4fcec360a11..e082e24ae10 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/deleteAccount.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/deleteAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.deleteAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/deleteSession.ts b/packages/ozone/src/lexicon/types/com/atproto/server/deleteSession.ts
index 82672f1d1c7..90c6882cf87 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/deleteSession.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/deleteSession.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.deleteSession'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/describeServer.ts b/packages/ozone/src/lexicon/types/com/atproto/server/describeServer.ts
index e21868158b3..0e4fc1fc242 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/describeServer.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/describeServer.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.describeServer'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -56,16 +58,14 @@ export interface Links {
   [k: string]: unknown
 }
 
-export function isLinks(v: unknown): v is Links {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.describeServer#links'
-  )
+export function isLinks(
+  v: unknown,
+): v is Links & { $type: $Type<'com.atproto.server.describeServer', 'links'> } {
+  return is$typed(v, id, 'links')
 }
 
-export function validateLinks(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.describeServer#links', v)
+export function validateLinks(v: unknown) {
+  return lexicons.validate(`${id}#links`, v) as ValidationResult<Links>
 }
 
 export interface Contact {
@@ -73,14 +73,12 @@ export interface Contact {
   [k: string]: unknown
 }
 
-export function isContact(v: unknown): v is Contact {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.describeServer#contact'
-  )
+export function isContact(v: unknown): v is Contact & {
+  $type: $Type<'com.atproto.server.describeServer', 'contact'>
+} {
+  return is$typed(v, id, 'contact')
 }
 
-export function validateContact(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.describeServer#contact', v)
+export function validateContact(v: unknown) {
+  return lexicons.validate(`${id}#contact`, v) as ValidationResult<Contact>
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts b/packages/ozone/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
index 82c3ffa8c31..9668cf1f1e6 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoServerDefs from './defs'
 
+const id = 'com.atproto.server.getAccountInviteCodes'
+
 export interface QueryParams {
   includeUsed: boolean
   /** Controls whether any new 'earned' but not 'created' invites should be created. */
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/getServiceAuth.ts b/packages/ozone/src/lexicon/types/com/atproto/server/getServiceAuth.ts
index 14f249fde44..54b3a3d4423 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/getServiceAuth.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/getServiceAuth.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.getServiceAuth'
+
 export interface QueryParams {
   /** The DID of the service that the token will be used to authenticate with */
   aud: string
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/getSession.ts b/packages/ozone/src/lexicon/types/com/atproto/server/getSession.ts
index be34cb92afd..e98c753d9d0 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/getSession.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/getSession.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.getSession'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/listAppPasswords.ts b/packages/ozone/src/lexicon/types/com/atproto/server/listAppPasswords.ts
index 397e7043e67..085637d4e51 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/listAppPasswords.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/listAppPasswords.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.listAppPasswords'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -50,14 +52,15 @@ export interface AppPassword {
   [k: string]: unknown
 }
 
-export function isAppPassword(v: unknown): v is AppPassword {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.listAppPasswords#appPassword'
-  )
+export function isAppPassword(v: unknown): v is AppPassword & {
+  $type: $Type<'com.atproto.server.listAppPasswords', 'appPassword'>
+} {
+  return is$typed(v, id, 'appPassword')
 }
 
-export function validateAppPassword(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.listAppPasswords#appPassword', v)
+export function validateAppPassword(v: unknown) {
+  return lexicons.validate(
+    `${id}#appPassword`,
+    v,
+  ) as ValidationResult<AppPassword>
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/refreshSession.ts b/packages/ozone/src/lexicon/types/com/atproto/server/refreshSession.ts
index 1d6272a0d71..de1b570bf1a 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/refreshSession.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/refreshSession.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.refreshSession'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/requestAccountDelete.ts b/packages/ozone/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
index 82672f1d1c7..85131190ec9 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.requestAccountDelete'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts b/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
index 82672f1d1c7..fb58814aeb4 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.requestEmailConfirmation'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts b/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
index 24dce3e12af..919e704328a 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.requestEmailUpdate'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/requestPasswordReset.ts b/packages/ozone/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
index d0f3f2ad769..f9bcec52a1f 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.requestPasswordReset'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/reserveSigningKey.ts b/packages/ozone/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
index 0ec1e80c77c..64dfb8c8414 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.reserveSigningKey'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/resetPassword.ts b/packages/ozone/src/lexicon/types/com/atproto/server/resetPassword.ts
index 38f63382cf0..d842e7e266d 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/resetPassword.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/resetPassword.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.resetPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/revokeAppPassword.ts b/packages/ozone/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
index 769ad6aa521..92a8204560e 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.revokeAppPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/server/updateEmail.ts b/packages/ozone/src/lexicon/types/com/atproto/server/updateEmail.ts
index 34fc7421979..4381078a0a6 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/server/updateEmail.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/server/updateEmail.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.updateEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getBlob.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getBlob.ts
index b1581d6e473..d42913abd01 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getBlob.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getBlob.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.getBlob'
+
 export interface QueryParams {
   /** The DID of the account. */
   did: string
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getBlocks.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getBlocks.ts
index 925b4a7d50b..a7dc7e73000 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getBlocks.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getBlocks.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.getBlocks'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getCheckout.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getCheckout.ts
index 51856b9088d..53d5b4bf39b 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getCheckout.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getCheckout.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.getCheckout'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getHead.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getHead.ts
index adedd4cf211..1adceb80d8a 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getHead.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getHead.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.getHead'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getLatestCommit.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
index f0e9a757d04..290c02e15fa 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.getLatestCommit'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getRecord.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getRecord.ts
index 83d88655228..8f03eb23951 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getRecord.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getRecord.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.getRecord'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getRepo.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getRepo.ts
index 883ff37def1..9cde9a4e01b 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getRepo.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getRepo.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.getRepo'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/getRepoStatus.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
index 00abbeaa84b..414e67e7a67 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.getRepoStatus'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/listBlobs.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/listBlobs.ts
index c6ea955ee0c..58fea9c1282 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/listBlobs.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/listBlobs.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.listBlobs'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/listRepos.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/listRepos.ts
index 5628b0b5147..468977d448c 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/listRepos.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/listRepos.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.listRepos'
+
 export interface QueryParams {
   limit: number
   cursor?: string
@@ -57,14 +59,12 @@ export interface Repo {
   [k: string]: unknown
 }
 
-export function isRepo(v: unknown): v is Repo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.listRepos#repo'
-  )
+export function isRepo(
+  v: unknown,
+): v is Repo & { $type: $Type<'com.atproto.sync.listRepos', 'repo'> } {
+  return is$typed(v, id, 'repo')
 }
 
-export function validateRepo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.listRepos#repo', v)
+export function validateRepo(v: unknown) {
+  return lexicons.validate(`${id}#repo`, v) as ValidationResult<Repo>
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
index 8a0af577c7c..8fd62afe59e 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.notifyOfUpdate'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/requestCrawl.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/requestCrawl.ts
index 31180aabf58..5148b8c5f24 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/requestCrawl.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/requestCrawl.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.requestCrawl'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/subscribeRepos.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
index 8f9855a5da4..b986110ccbe 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, ErrorFrame } from '@atproto/xrpc-server'
 import { IncomingMessage } from 'http'
 
+const id = 'com.atproto.sync.subscribeRepos'
+
 export interface QueryParams {
   /** The last known event seq number to backfill from. */
   cursor?: number
@@ -61,16 +63,14 @@ export interface Commit {
   [k: string]: unknown
 }
 
-export function isCommit(v: unknown): v is Commit {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#commit'
-  )
+export function isCommit(
+  v: unknown,
+): v is Commit & { $type: $Type<'com.atproto.sync.subscribeRepos', 'commit'> } {
+  return is$typed(v, id, 'commit')
 }
 
-export function validateCommit(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#commit', v)
+export function validateCommit(v: unknown) {
+  return lexicons.validate(`${id}#commit`, v) as ValidationResult<Commit>
 }
 
 /** Represents a change to an account's identity. Could be an updated handle, signing key, or pds hosting endpoint. Serves as a prod to all downstream services to refresh their identity cache. */
@@ -83,16 +83,14 @@ export interface Identity {
   [k: string]: unknown
 }
 
-export function isIdentity(v: unknown): v is Identity {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#identity'
-  )
+export function isIdentity(v: unknown): v is Identity & {
+  $type: $Type<'com.atproto.sync.subscribeRepos', 'identity'>
+} {
+  return is$typed(v, id, 'identity')
 }
 
-export function validateIdentity(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#identity', v)
+export function validateIdentity(v: unknown) {
+  return lexicons.validate(`${id}#identity`, v) as ValidationResult<Identity>
 }
 
 /** Represents a change to an account's status on a host (eg, PDS or Relay). The semantics of this event are that the status is at the host which emitted the event, not necessarily that at the currently active PDS. Eg, a Relay takedown would emit a takedown with active=false, even if the PDS is still active. */
@@ -107,16 +105,14 @@ export interface Account {
   [k: string]: unknown
 }
 
-export function isAccount(v: unknown): v is Account {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#account'
-  )
+export function isAccount(v: unknown): v is Account & {
+  $type: $Type<'com.atproto.sync.subscribeRepos', 'account'>
+} {
+  return is$typed(v, id, 'account')
 }
 
-export function validateAccount(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#account', v)
+export function validateAccount(v: unknown) {
+  return lexicons.validate(`${id}#account`, v) as ValidationResult<Account>
 }
 
 /** DEPRECATED -- Use #identity event instead */
@@ -128,16 +124,14 @@ export interface Handle {
   [k: string]: unknown
 }
 
-export function isHandle(v: unknown): v is Handle {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#handle'
-  )
+export function isHandle(
+  v: unknown,
+): v is Handle & { $type: $Type<'com.atproto.sync.subscribeRepos', 'handle'> } {
+  return is$typed(v, id, 'handle')
 }
 
-export function validateHandle(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#handle', v)
+export function validateHandle(v: unknown) {
+  return lexicons.validate(`${id}#handle`, v) as ValidationResult<Handle>
 }
 
 /** DEPRECATED -- Use #account event instead */
@@ -149,16 +143,14 @@ export interface Migrate {
   [k: string]: unknown
 }
 
-export function isMigrate(v: unknown): v is Migrate {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#migrate'
-  )
+export function isMigrate(v: unknown): v is Migrate & {
+  $type: $Type<'com.atproto.sync.subscribeRepos', 'migrate'>
+} {
+  return is$typed(v, id, 'migrate')
 }
 
-export function validateMigrate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#migrate', v)
+export function validateMigrate(v: unknown) {
+  return lexicons.validate(`${id}#migrate`, v) as ValidationResult<Migrate>
 }
 
 /** DEPRECATED -- Use #account event instead */
@@ -169,16 +161,14 @@ export interface Tombstone {
   [k: string]: unknown
 }
 
-export function isTombstone(v: unknown): v is Tombstone {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#tombstone'
-  )
+export function isTombstone(v: unknown): v is Tombstone & {
+  $type: $Type<'com.atproto.sync.subscribeRepos', 'tombstone'>
+} {
+  return is$typed(v, id, 'tombstone')
 }
 
-export function validateTombstone(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#tombstone', v)
+export function validateTombstone(v: unknown) {
+  return lexicons.validate(`${id}#tombstone`, v) as ValidationResult<Tombstone>
 }
 
 export interface Info {
@@ -187,16 +177,14 @@ export interface Info {
   [k: string]: unknown
 }
 
-export function isInfo(v: unknown): v is Info {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#info'
-  )
+export function isInfo(
+  v: unknown,
+): v is Info & { $type: $Type<'com.atproto.sync.subscribeRepos', 'info'> } {
+  return is$typed(v, id, 'info')
 }
 
-export function validateInfo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#info', v)
+export function validateInfo(v: unknown) {
+  return lexicons.validate(`${id}#info`, v) as ValidationResult<Info>
 }
 
 /** A repo operation, ie a mutation of a single record. */
@@ -208,14 +196,12 @@ export interface RepoOp {
   [k: string]: unknown
 }
 
-export function isRepoOp(v: unknown): v is RepoOp {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#repoOp'
-  )
+export function isRepoOp(
+  v: unknown,
+): v is RepoOp & { $type: $Type<'com.atproto.sync.subscribeRepos', 'repoOp'> } {
+  return is$typed(v, id, 'repoOp')
 }
 
-export function validateRepoOp(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#repoOp', v)
+export function validateRepoOp(v: unknown) {
+  return lexicons.validate(`${id}#repoOp`, v) as ValidationResult<RepoOp>
 }
diff --git a/packages/ozone/src/lexicon/types/com/atproto/temp/addReservedHandle.ts b/packages/ozone/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
index b884cb08998..374ab85c589 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.temp.addReservedHandle'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts b/packages/ozone/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
index 9486bce2b2b..948068c5a6d 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.temp.checkSignupQueue'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/ozone/src/lexicon/types/com/atproto/temp/fetchLabels.ts b/packages/ozone/src/lexicon/types/com/atproto/temp/fetchLabels.ts
index 0fbdeed1196..c8741a1331b 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/temp/fetchLabels.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/temp/fetchLabels.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoLabelDefs from '../label/defs'
 
+const id = 'com.atproto.temp.fetchLabels'
+
 export interface QueryParams {
   since?: number
   limit: number
diff --git a/packages/ozone/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts b/packages/ozone/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
index c977500fc33..556fe779d21 100644
--- a/packages/ozone/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
+++ b/packages/ozone/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.temp.requestPhoneVerification'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/communication/createTemplate.ts b/packages/ozone/src/lexicon/types/tools/ozone/communication/createTemplate.ts
index 6d29f93bdba..b82931c64c7 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/communication/createTemplate.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/communication/createTemplate.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneCommunicationDefs from './defs'
 
+const id = 'tools.ozone.communication.createTemplate'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/communication/defs.ts b/packages/ozone/src/lexicon/types/tools/ozone/communication/defs.ts
index 1342dc3c399..13fcc5b58d6 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/communication/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/communication/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'tools.ozone.communication.defs'
 
 export interface TemplateView {
   id: string
@@ -24,14 +26,15 @@ export interface TemplateView {
   [k: string]: unknown
 }
 
-export function isTemplateView(v: unknown): v is TemplateView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.communication.defs#templateView'
-  )
+export function isTemplateView(v: unknown): v is TemplateView & {
+  $type: $Type<'tools.ozone.communication.defs', 'templateView'>
+} {
+  return is$typed(v, id, 'templateView')
 }
 
-export function validateTemplateView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.communication.defs#templateView', v)
+export function validateTemplateView(v: unknown) {
+  return lexicons.validate(
+    `${id}#templateView`,
+    v,
+  ) as ValidationResult<TemplateView>
 }
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts b/packages/ozone/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts
index c5ae5cd469f..bcdc2b523b1 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'tools.ozone.communication.deleteTemplate'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/communication/listTemplates.ts b/packages/ozone/src/lexicon/types/tools/ozone/communication/listTemplates.ts
index 4573ac7bbb9..74260b5c495 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/communication/listTemplates.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/communication/listTemplates.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneCommunicationDefs from './defs'
 
+const id = 'tools.ozone.communication.listTemplates'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/communication/updateTemplate.ts b/packages/ozone/src/lexicon/types/tools/ozone/communication/updateTemplate.ts
index f8c5817b4d9..e7bcacb14ff 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/communication/updateTemplate.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/communication/updateTemplate.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneCommunicationDefs from './defs'
 
+const id = 'tools.ozone.communication.updateTemplate'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts
index 403f7832a6d..56a822245e7 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/defs.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 import * as ChatBskyConvoDefs from '../../../chat/bsky/convo/defs'
@@ -12,6 +12,8 @@ import * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs'
 import * as ComAtprotoServerDefs from '../../../com/atproto/server/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const id = 'tools.ozone.moderation.defs'
+
 export interface ModEventView {
   id: number
   event:
@@ -47,16 +49,17 @@ export interface ModEventView {
   [k: string]: unknown
 }
 
-export function isModEventView(v: unknown): v is ModEventView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventView'
-  )
+export function isModEventView(v: unknown): v is ModEventView & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventView'>
+} {
+  return is$typed(v, id, 'modEventView')
 }
 
-export function validateModEventView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventView', v)
+export function validateModEventView(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventView`,
+    v,
+  ) as ValidationResult<ModEventView>
 }
 
 export interface ModEventViewDetail {
@@ -93,16 +96,17 @@ export interface ModEventViewDetail {
   [k: string]: unknown
 }
 
-export function isModEventViewDetail(v: unknown): v is ModEventViewDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventViewDetail'
-  )
+export function isModEventViewDetail(v: unknown): v is ModEventViewDetail & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventViewDetail'>
+} {
+  return is$typed(v, id, 'modEventViewDetail')
 }
 
-export function validateModEventViewDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventViewDetail', v)
+export function validateModEventViewDetail(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventViewDetail`,
+    v,
+  ) as ValidationResult<ModEventViewDetail>
 }
 
 export interface SubjectStatusView {
@@ -139,16 +143,17 @@ export interface SubjectStatusView {
   [k: string]: unknown
 }
 
-export function isSubjectStatusView(v: unknown): v is SubjectStatusView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#subjectStatusView'
-  )
+export function isSubjectStatusView(v: unknown): v is SubjectStatusView & {
+  $type: $Type<'tools.ozone.moderation.defs', 'subjectStatusView'>
+} {
+  return is$typed(v, id, 'subjectStatusView')
 }
 
-export function validateSubjectStatusView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#subjectStatusView', v)
+export function validateSubjectStatusView(v: unknown) {
+  return lexicons.validate(
+    `${id}#subjectStatusView`,
+    v,
+  ) as ValidationResult<SubjectStatusView>
 }
 
 export type SubjectReviewState =
@@ -159,13 +164,13 @@ export type SubjectReviewState =
   | (string & {})
 
 /** Moderator review status of a subject: Open. Indicates that the subject needs to be reviewed by a moderator */
-export const REVIEWOPEN = 'tools.ozone.moderation.defs#reviewOpen'
+export const REVIEWOPEN = `${id}#reviewOpen`
 /** Moderator review status of a subject: Escalated. Indicates that the subject was escalated for review by a moderator */
-export const REVIEWESCALATED = 'tools.ozone.moderation.defs#reviewEscalated'
+export const REVIEWESCALATED = `${id}#reviewEscalated`
 /** Moderator review status of a subject: Closed. Indicates that the subject was already reviewed and resolved by a moderator */
-export const REVIEWCLOSED = 'tools.ozone.moderation.defs#reviewClosed'
+export const REVIEWCLOSED = `${id}#reviewClosed`
 /** Moderator review status of a subject: Unnecessary. Indicates that the subject does not need a review at the moment but there is probably some moderation related metadata available for it */
-export const REVIEWNONE = 'tools.ozone.moderation.defs#reviewNone'
+export const REVIEWNONE = `${id}#reviewNone`
 
 /** Take down a subject permanently or temporarily */
 export interface ModEventTakedown {
@@ -177,16 +182,17 @@ export interface ModEventTakedown {
   [k: string]: unknown
 }
 
-export function isModEventTakedown(v: unknown): v is ModEventTakedown {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventTakedown'
-  )
+export function isModEventTakedown(v: unknown): v is ModEventTakedown & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventTakedown'>
+} {
+  return is$typed(v, id, 'modEventTakedown')
 }
 
-export function validateModEventTakedown(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventTakedown', v)
+export function validateModEventTakedown(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventTakedown`,
+    v,
+  ) as ValidationResult<ModEventTakedown>
 }
 
 /** Revert take down action on a subject */
@@ -198,19 +204,17 @@ export interface ModEventReverseTakedown {
 
 export function isModEventReverseTakedown(
   v: unknown,
-): v is ModEventReverseTakedown {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventReverseTakedown'
-  )
+): v is ModEventReverseTakedown & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventReverseTakedown'>
+} {
+  return is$typed(v, id, 'modEventReverseTakedown')
 }
 
-export function validateModEventReverseTakedown(v: unknown): ValidationResult {
+export function validateModEventReverseTakedown(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventReverseTakedown',
+    `${id}#modEventReverseTakedown`,
     v,
-  )
+  ) as ValidationResult<ModEventReverseTakedown>
 }
 
 /** Resolve appeal on a subject */
@@ -222,19 +226,17 @@ export interface ModEventResolveAppeal {
 
 export function isModEventResolveAppeal(
   v: unknown,
-): v is ModEventResolveAppeal {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventResolveAppeal'
-  )
+): v is ModEventResolveAppeal & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventResolveAppeal'>
+} {
+  return is$typed(v, id, 'modEventResolveAppeal')
 }
 
-export function validateModEventResolveAppeal(v: unknown): ValidationResult {
+export function validateModEventResolveAppeal(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventResolveAppeal',
+    `${id}#modEventResolveAppeal`,
     v,
-  )
+  ) as ValidationResult<ModEventResolveAppeal>
 }
 
 /** Add a comment to a subject */
@@ -245,16 +247,17 @@ export interface ModEventComment {
   [k: string]: unknown
 }
 
-export function isModEventComment(v: unknown): v is ModEventComment {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventComment'
-  )
+export function isModEventComment(v: unknown): v is ModEventComment & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventComment'>
+} {
+  return is$typed(v, id, 'modEventComment')
 }
 
-export function validateModEventComment(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventComment', v)
+export function validateModEventComment(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventComment`,
+    v,
+  ) as ValidationResult<ModEventComment>
 }
 
 /** Report a subject */
@@ -266,16 +269,17 @@ export interface ModEventReport {
   [k: string]: unknown
 }
 
-export function isModEventReport(v: unknown): v is ModEventReport {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventReport'
-  )
+export function isModEventReport(v: unknown): v is ModEventReport & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventReport'>
+} {
+  return is$typed(v, id, 'modEventReport')
 }
 
-export function validateModEventReport(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventReport', v)
+export function validateModEventReport(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventReport`,
+    v,
+  ) as ValidationResult<ModEventReport>
 }
 
 /** Apply/Negate labels on a subject */
@@ -286,16 +290,17 @@ export interface ModEventLabel {
   [k: string]: unknown
 }
 
-export function isModEventLabel(v: unknown): v is ModEventLabel {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventLabel'
-  )
+export function isModEventLabel(v: unknown): v is ModEventLabel & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventLabel'>
+} {
+  return is$typed(v, id, 'modEventLabel')
 }
 
-export function validateModEventLabel(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventLabel', v)
+export function validateModEventLabel(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventLabel`,
+    v,
+  ) as ValidationResult<ModEventLabel>
 }
 
 export interface ModEventAcknowledge {
@@ -305,16 +310,17 @@ export interface ModEventAcknowledge {
   [k: string]: unknown
 }
 
-export function isModEventAcknowledge(v: unknown): v is ModEventAcknowledge {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventAcknowledge'
-  )
+export function isModEventAcknowledge(v: unknown): v is ModEventAcknowledge & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventAcknowledge'>
+} {
+  return is$typed(v, id, 'modEventAcknowledge')
 }
 
-export function validateModEventAcknowledge(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventAcknowledge', v)
+export function validateModEventAcknowledge(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventAcknowledge`,
+    v,
+  ) as ValidationResult<ModEventAcknowledge>
 }
 
 export interface ModEventEscalate {
@@ -322,16 +328,17 @@ export interface ModEventEscalate {
   [k: string]: unknown
 }
 
-export function isModEventEscalate(v: unknown): v is ModEventEscalate {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventEscalate'
-  )
+export function isModEventEscalate(v: unknown): v is ModEventEscalate & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventEscalate'>
+} {
+  return is$typed(v, id, 'modEventEscalate')
 }
 
-export function validateModEventEscalate(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventEscalate', v)
+export function validateModEventEscalate(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventEscalate`,
+    v,
+  ) as ValidationResult<ModEventEscalate>
 }
 
 /** Mute incoming reports on a subject */
@@ -342,16 +349,17 @@ export interface ModEventMute {
   [k: string]: unknown
 }
 
-export function isModEventMute(v: unknown): v is ModEventMute {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventMute'
-  )
+export function isModEventMute(v: unknown): v is ModEventMute & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventMute'>
+} {
+  return is$typed(v, id, 'modEventMute')
 }
 
-export function validateModEventMute(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventMute', v)
+export function validateModEventMute(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventMute`,
+    v,
+  ) as ValidationResult<ModEventMute>
 }
 
 /** Unmute action on a subject */
@@ -361,16 +369,17 @@ export interface ModEventUnmute {
   [k: string]: unknown
 }
 
-export function isModEventUnmute(v: unknown): v is ModEventUnmute {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventUnmute'
-  )
+export function isModEventUnmute(v: unknown): v is ModEventUnmute & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventUnmute'>
+} {
+  return is$typed(v, id, 'modEventUnmute')
 }
 
-export function validateModEventUnmute(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventUnmute', v)
+export function validateModEventUnmute(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventUnmute`,
+    v,
+  ) as ValidationResult<ModEventUnmute>
 }
 
 /** Mute incoming reports from an account */
@@ -381,19 +390,19 @@ export interface ModEventMuteReporter {
   [k: string]: unknown
 }
 
-export function isModEventMuteReporter(v: unknown): v is ModEventMuteReporter {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventMuteReporter'
-  )
+export function isModEventMuteReporter(
+  v: unknown,
+): v is ModEventMuteReporter & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventMuteReporter'>
+} {
+  return is$typed(v, id, 'modEventMuteReporter')
 }
 
-export function validateModEventMuteReporter(v: unknown): ValidationResult {
+export function validateModEventMuteReporter(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventMuteReporter',
+    `${id}#modEventMuteReporter`,
     v,
-  )
+  ) as ValidationResult<ModEventMuteReporter>
 }
 
 /** Unmute incoming reports from an account */
@@ -405,19 +414,17 @@ export interface ModEventUnmuteReporter {
 
 export function isModEventUnmuteReporter(
   v: unknown,
-): v is ModEventUnmuteReporter {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventUnmuteReporter'
-  )
+): v is ModEventUnmuteReporter & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventUnmuteReporter'>
+} {
+  return is$typed(v, id, 'modEventUnmuteReporter')
 }
 
-export function validateModEventUnmuteReporter(v: unknown): ValidationResult {
+export function validateModEventUnmuteReporter(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventUnmuteReporter',
+    `${id}#modEventUnmuteReporter`,
     v,
-  )
+  ) as ValidationResult<ModEventUnmuteReporter>
 }
 
 /** Keep a log of outgoing email to a user */
@@ -431,16 +438,17 @@ export interface ModEventEmail {
   [k: string]: unknown
 }
 
-export function isModEventEmail(v: unknown): v is ModEventEmail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventEmail'
-  )
+export function isModEventEmail(v: unknown): v is ModEventEmail & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventEmail'>
+} {
+  return is$typed(v, id, 'modEventEmail')
 }
 
-export function validateModEventEmail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventEmail', v)
+export function validateModEventEmail(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventEmail`,
+    v,
+  ) as ValidationResult<ModEventEmail>
 }
 
 /** Divert a record's blobs to a 3rd party service for further scanning/tagging */
@@ -449,16 +457,17 @@ export interface ModEventDivert {
   [k: string]: unknown
 }
 
-export function isModEventDivert(v: unknown): v is ModEventDivert {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventDivert'
-  )
+export function isModEventDivert(v: unknown): v is ModEventDivert & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventDivert'>
+} {
+  return is$typed(v, id, 'modEventDivert')
 }
 
-export function validateModEventDivert(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventDivert', v)
+export function validateModEventDivert(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventDivert`,
+    v,
+  ) as ValidationResult<ModEventDivert>
 }
 
 /** Add/Remove a tag on a subject */
@@ -472,16 +481,17 @@ export interface ModEventTag {
   [k: string]: unknown
 }
 
-export function isModEventTag(v: unknown): v is ModEventTag {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventTag'
-  )
+export function isModEventTag(v: unknown): v is ModEventTag & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventTag'>
+} {
+  return is$typed(v, id, 'modEventTag')
 }
 
-export function validateModEventTag(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventTag', v)
+export function validateModEventTag(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventTag`,
+    v,
+  ) as ValidationResult<ModEventTag>
 }
 
 /** Logs account status related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
@@ -501,16 +511,17 @@ export interface AccountEvent {
   [k: string]: unknown
 }
 
-export function isAccountEvent(v: unknown): v is AccountEvent {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#accountEvent'
-  )
+export function isAccountEvent(v: unknown): v is AccountEvent & {
+  $type: $Type<'tools.ozone.moderation.defs', 'accountEvent'>
+} {
+  return is$typed(v, id, 'accountEvent')
 }
 
-export function validateAccountEvent(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#accountEvent', v)
+export function validateAccountEvent(v: unknown) {
+  return lexicons.validate(
+    `${id}#accountEvent`,
+    v,
+  ) as ValidationResult<AccountEvent>
 }
 
 /** Logs identity related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
@@ -523,16 +534,17 @@ export interface IdentityEvent {
   [k: string]: unknown
 }
 
-export function isIdentityEvent(v: unknown): v is IdentityEvent {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#identityEvent'
-  )
+export function isIdentityEvent(v: unknown): v is IdentityEvent & {
+  $type: $Type<'tools.ozone.moderation.defs', 'identityEvent'>
+} {
+  return is$typed(v, id, 'identityEvent')
 }
 
-export function validateIdentityEvent(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#identityEvent', v)
+export function validateIdentityEvent(v: unknown) {
+  return lexicons.validate(
+    `${id}#identityEvent`,
+    v,
+  ) as ValidationResult<IdentityEvent>
 }
 
 /** Logs lifecycle event on a record subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
@@ -544,16 +556,17 @@ export interface RecordEvent {
   [k: string]: unknown
 }
 
-export function isRecordEvent(v: unknown): v is RecordEvent {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordEvent'
-  )
+export function isRecordEvent(v: unknown): v is RecordEvent & {
+  $type: $Type<'tools.ozone.moderation.defs', 'recordEvent'>
+} {
+  return is$typed(v, id, 'recordEvent')
 }
 
-export function validateRecordEvent(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordEvent', v)
+export function validateRecordEvent(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordEvent`,
+    v,
+  ) as ValidationResult<RecordEvent>
 }
 
 export interface RepoView {
@@ -571,16 +584,14 @@ export interface RepoView {
   [k: string]: unknown
 }
 
-export function isRepoView(v: unknown): v is RepoView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#repoView'
-  )
+export function isRepoView(
+  v: unknown,
+): v is RepoView & { $type: $Type<'tools.ozone.moderation.defs', 'repoView'> } {
+  return is$typed(v, id, 'repoView')
 }
 
-export function validateRepoView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#repoView', v)
+export function validateRepoView(v: unknown) {
+  return lexicons.validate(`${id}#repoView`, v) as ValidationResult<RepoView>
 }
 
 export interface RepoViewDetail {
@@ -601,16 +612,17 @@ export interface RepoViewDetail {
   [k: string]: unknown
 }
 
-export function isRepoViewDetail(v: unknown): v is RepoViewDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#repoViewDetail'
-  )
+export function isRepoViewDetail(v: unknown): v is RepoViewDetail & {
+  $type: $Type<'tools.ozone.moderation.defs', 'repoViewDetail'>
+} {
+  return is$typed(v, id, 'repoViewDetail')
 }
 
-export function validateRepoViewDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#repoViewDetail', v)
+export function validateRepoViewDetail(v: unknown) {
+  return lexicons.validate(
+    `${id}#repoViewDetail`,
+    v,
+  ) as ValidationResult<RepoViewDetail>
 }
 
 export interface RepoViewNotFound {
@@ -618,16 +630,17 @@ export interface RepoViewNotFound {
   [k: string]: unknown
 }
 
-export function isRepoViewNotFound(v: unknown): v is RepoViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#repoViewNotFound'
-  )
+export function isRepoViewNotFound(v: unknown): v is RepoViewNotFound & {
+  $type: $Type<'tools.ozone.moderation.defs', 'repoViewNotFound'>
+} {
+  return is$typed(v, id, 'repoViewNotFound')
 }
 
-export function validateRepoViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#repoViewNotFound', v)
+export function validateRepoViewNotFound(v: unknown) {
+  return lexicons.validate(
+    `${id}#repoViewNotFound`,
+    v,
+  ) as ValidationResult<RepoViewNotFound>
 }
 
 export interface RecordView {
@@ -641,16 +654,17 @@ export interface RecordView {
   [k: string]: unknown
 }
 
-export function isRecordView(v: unknown): v is RecordView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordView'
-  )
+export function isRecordView(v: unknown): v is RecordView & {
+  $type: $Type<'tools.ozone.moderation.defs', 'recordView'>
+} {
+  return is$typed(v, id, 'recordView')
 }
 
-export function validateRecordView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordView', v)
+export function validateRecordView(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordView`,
+    v,
+  ) as ValidationResult<RecordView>
 }
 
 export interface RecordViewDetail {
@@ -665,16 +679,17 @@ export interface RecordViewDetail {
   [k: string]: unknown
 }
 
-export function isRecordViewDetail(v: unknown): v is RecordViewDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordViewDetail'
-  )
+export function isRecordViewDetail(v: unknown): v is RecordViewDetail & {
+  $type: $Type<'tools.ozone.moderation.defs', 'recordViewDetail'>
+} {
+  return is$typed(v, id, 'recordViewDetail')
 }
 
-export function validateRecordViewDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordViewDetail', v)
+export function validateRecordViewDetail(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordViewDetail`,
+    v,
+  ) as ValidationResult<RecordViewDetail>
 }
 
 export interface RecordViewNotFound {
@@ -682,16 +697,17 @@ export interface RecordViewNotFound {
   [k: string]: unknown
 }
 
-export function isRecordViewNotFound(v: unknown): v is RecordViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordViewNotFound'
-  )
+export function isRecordViewNotFound(v: unknown): v is RecordViewNotFound & {
+  $type: $Type<'tools.ozone.moderation.defs', 'recordViewNotFound'>
+} {
+  return is$typed(v, id, 'recordViewNotFound')
 }
 
-export function validateRecordViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordViewNotFound', v)
+export function validateRecordViewNotFound(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordViewNotFound`,
+    v,
+  ) as ValidationResult<RecordViewNotFound>
 }
 
 export interface Moderation {
@@ -699,16 +715,17 @@ export interface Moderation {
   [k: string]: unknown
 }
 
-export function isModeration(v: unknown): v is Moderation {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#moderation'
-  )
+export function isModeration(v: unknown): v is Moderation & {
+  $type: $Type<'tools.ozone.moderation.defs', 'moderation'>
+} {
+  return is$typed(v, id, 'moderation')
 }
 
-export function validateModeration(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#moderation', v)
+export function validateModeration(v: unknown) {
+  return lexicons.validate(
+    `${id}#moderation`,
+    v,
+  ) as ValidationResult<Moderation>
 }
 
 export interface ModerationDetail {
@@ -716,16 +733,17 @@ export interface ModerationDetail {
   [k: string]: unknown
 }
 
-export function isModerationDetail(v: unknown): v is ModerationDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#moderationDetail'
-  )
+export function isModerationDetail(v: unknown): v is ModerationDetail & {
+  $type: $Type<'tools.ozone.moderation.defs', 'moderationDetail'>
+} {
+  return is$typed(v, id, 'moderationDetail')
 }
 
-export function validateModerationDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#moderationDetail', v)
+export function validateModerationDetail(v: unknown) {
+  return lexicons.validate(
+    `${id}#moderationDetail`,
+    v,
+  ) as ValidationResult<ModerationDetail>
 }
 
 export interface BlobView {
@@ -741,16 +759,14 @@ export interface BlobView {
   [k: string]: unknown
 }
 
-export function isBlobView(v: unknown): v is BlobView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#blobView'
-  )
+export function isBlobView(
+  v: unknown,
+): v is BlobView & { $type: $Type<'tools.ozone.moderation.defs', 'blobView'> } {
+  return is$typed(v, id, 'blobView')
 }
 
-export function validateBlobView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#blobView', v)
+export function validateBlobView(v: unknown) {
+  return lexicons.validate(`${id}#blobView`, v) as ValidationResult<BlobView>
 }
 
 export interface ImageDetails {
@@ -759,16 +775,17 @@ export interface ImageDetails {
   [k: string]: unknown
 }
 
-export function isImageDetails(v: unknown): v is ImageDetails {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#imageDetails'
-  )
+export function isImageDetails(v: unknown): v is ImageDetails & {
+  $type: $Type<'tools.ozone.moderation.defs', 'imageDetails'>
+} {
+  return is$typed(v, id, 'imageDetails')
 }
 
-export function validateImageDetails(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#imageDetails', v)
+export function validateImageDetails(v: unknown) {
+  return lexicons.validate(
+    `${id}#imageDetails`,
+    v,
+  ) as ValidationResult<ImageDetails>
 }
 
 export interface VideoDetails {
@@ -778,16 +795,17 @@ export interface VideoDetails {
   [k: string]: unknown
 }
 
-export function isVideoDetails(v: unknown): v is VideoDetails {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#videoDetails'
-  )
+export function isVideoDetails(v: unknown): v is VideoDetails & {
+  $type: $Type<'tools.ozone.moderation.defs', 'videoDetails'>
+} {
+  return is$typed(v, id, 'videoDetails')
 }
 
-export function validateVideoDetails(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#videoDetails', v)
+export function validateVideoDetails(v: unknown) {
+  return lexicons.validate(
+    `${id}#videoDetails`,
+    v,
+  ) as ValidationResult<VideoDetails>
 }
 
 export interface AccountHosting {
@@ -806,16 +824,17 @@ export interface AccountHosting {
   [k: string]: unknown
 }
 
-export function isAccountHosting(v: unknown): v is AccountHosting {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#accountHosting'
-  )
+export function isAccountHosting(v: unknown): v is AccountHosting & {
+  $type: $Type<'tools.ozone.moderation.defs', 'accountHosting'>
+} {
+  return is$typed(v, id, 'accountHosting')
 }
 
-export function validateAccountHosting(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#accountHosting', v)
+export function validateAccountHosting(v: unknown) {
+  return lexicons.validate(
+    `${id}#accountHosting`,
+    v,
+  ) as ValidationResult<AccountHosting>
 }
 
 export interface RecordHosting {
@@ -826,14 +845,15 @@ export interface RecordHosting {
   [k: string]: unknown
 }
 
-export function isRecordHosting(v: unknown): v is RecordHosting {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordHosting'
-  )
+export function isRecordHosting(v: unknown): v is RecordHosting & {
+  $type: $Type<'tools.ozone.moderation.defs', 'recordHosting'>
+} {
+  return is$typed(v, id, 'recordHosting')
 }
 
-export function validateRecordHosting(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordHosting', v)
+export function validateRecordHosting(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordHosting`,
+    v,
+  ) as ValidationResult<RecordHosting>
 }
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/emitEvent.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
index 1399cf589ee..80a4fe08d09 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
@@ -3,14 +3,16 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const id = 'tools.ozone.moderation.emitEvent'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getEvent.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getEvent.ts
index b583510a791..1a84e25919e 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getEvent.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getEvent.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+const id = 'tools.ozone.moderation.getEvent'
+
 export interface QueryParams {
   id: number
 }
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecord.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecord.ts
index a3832cd161c..6d8e603b879 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecord.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecord.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+const id = 'tools.ozone.moderation.getRecord'
+
 export interface QueryParams {
   uri: string
   cid?: string
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecords.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecords.ts
index 2559727bd65..73a3199fa1f 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecords.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRecords.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+const id = 'tools.ozone.moderation.getRecords'
+
 export interface QueryParams {
   uris: string[]
 }
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepo.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepo.ts
index 853d6460e85..84845fe0772 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepo.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepo.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+const id = 'tools.ozone.moderation.getRepo'
+
 export interface QueryParams {
   did: string
 }
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepos.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepos.ts
index 71da4d1bac9..55245c421d4 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepos.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/getRepos.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+const id = 'tools.ozone.moderation.getRepos'
+
 export interface QueryParams {
   dids: string[]
 }
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryEvents.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryEvents.ts
index 3dff4ca7cf7..328812e02f6 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryEvents.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryEvents.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+const id = 'tools.ozone.moderation.queryEvents'
+
 export interface QueryParams {
   /** The types of events (fully qualified string in the format of tools.ozone.moderation.defs#modEvent<name>) to filter by. If not specified, all events are returned. */
   types?: string[]
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
index f1d5bb61690..e730c7cf694 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+const id = 'tools.ozone.moderation.queryStatuses'
+
 export interface QueryParams {
   /** All subjects, or subjects from given 'collections' param, belonging to the account specified in the 'subject' param will be returned. */
   includeAllUserRecords?: boolean
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/moderation/searchRepos.ts b/packages/ozone/src/lexicon/types/tools/ozone/moderation/searchRepos.ts
index 7696df54d0f..604790371c4 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/moderation/searchRepos.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/moderation/searchRepos.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+const id = 'tools.ozone.moderation.searchRepos'
+
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead */
   term?: string
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/server/getConfig.ts b/packages/ozone/src/lexicon/types/tools/ozone/server/getConfig.ts
index b05ce4246d9..6f39ec39ccd 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/server/getConfig.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/server/getConfig.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'tools.ozone.server.getConfig'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -51,16 +53,17 @@ export interface ServiceConfig {
   [k: string]: unknown
 }
 
-export function isServiceConfig(v: unknown): v is ServiceConfig {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.server.getConfig#serviceConfig'
-  )
+export function isServiceConfig(v: unknown): v is ServiceConfig & {
+  $type: $Type<'tools.ozone.server.getConfig', 'serviceConfig'>
+} {
+  return is$typed(v, id, 'serviceConfig')
 }
 
-export function validateServiceConfig(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.server.getConfig#serviceConfig', v)
+export function validateServiceConfig(v: unknown) {
+  return lexicons.validate(
+    `${id}#serviceConfig`,
+    v,
+  ) as ValidationResult<ServiceConfig>
 }
 
 export interface ViewerConfig {
@@ -72,14 +75,15 @@ export interface ViewerConfig {
   [k: string]: unknown
 }
 
-export function isViewerConfig(v: unknown): v is ViewerConfig {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.server.getConfig#viewerConfig'
-  )
+export function isViewerConfig(v: unknown): v is ViewerConfig & {
+  $type: $Type<'tools.ozone.server.getConfig', 'viewerConfig'>
+} {
+  return is$typed(v, id, 'viewerConfig')
 }
 
-export function validateViewerConfig(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.server.getConfig#viewerConfig', v)
+export function validateViewerConfig(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewerConfig`,
+    v,
+  ) as ValidationResult<ViewerConfig>
 }
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/set/addValues.ts b/packages/ozone/src/lexicon/types/tools/ozone/set/addValues.ts
index 1a48da4e682..15290b1da5a 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/addValues.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/addValues.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'tools.ozone.set.addValues'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/set/defs.ts b/packages/ozone/src/lexicon/types/tools/ozone/set/defs.ts
index 4256bf8a90f..60be9fcb90d 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'tools.ozone.set.defs'
 
 export interface Set {
   name: string
@@ -12,14 +14,14 @@ export interface Set {
   [k: string]: unknown
 }
 
-export function isSet(v: unknown): v is Set {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'tools.ozone.set.defs#set'
-  )
+export function isSet(
+  v: unknown,
+): v is Set & { $type: $Type<'tools.ozone.set.defs', 'set'> } {
+  return is$typed(v, id, 'set')
 }
 
-export function validateSet(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.set.defs#set', v)
+export function validateSet(v: unknown) {
+  return lexicons.validate(`${id}#set`, v) as ValidationResult<Set>
 }
 
 export interface SetView {
@@ -31,14 +33,12 @@ export interface SetView {
   [k: string]: unknown
 }
 
-export function isSetView(v: unknown): v is SetView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.set.defs#setView'
-  )
+export function isSetView(
+  v: unknown,
+): v is SetView & { $type: $Type<'tools.ozone.set.defs', 'setView'> } {
+  return is$typed(v, id, 'setView')
 }
 
-export function validateSetView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.set.defs#setView', v)
+export function validateSetView(v: unknown) {
+  return lexicons.validate(`${id}#setView`, v) as ValidationResult<SetView>
 }
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/set/deleteSet.ts b/packages/ozone/src/lexicon/types/tools/ozone/set/deleteSet.ts
index 8b1584c3a1a..997a74925b8 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/deleteSet.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/deleteSet.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'tools.ozone.set.deleteSet'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/set/deleteValues.ts b/packages/ozone/src/lexicon/types/tools/ozone/set/deleteValues.ts
index d1090863925..8f9a6bd91e5 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/deleteValues.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/deleteValues.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'tools.ozone.set.deleteValues'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/set/getValues.ts b/packages/ozone/src/lexicon/types/tools/ozone/set/getValues.ts
index abae3c0b33a..dca0e183a00 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/getValues.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/getValues.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneSetDefs from './defs'
 
+const id = 'tools.ozone.set.getValues'
+
 export interface QueryParams {
   name: string
   limit: number
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/set/querySets.ts b/packages/ozone/src/lexicon/types/tools/ozone/set/querySets.ts
index 1eea93a7c4c..34531052800 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/querySets.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/querySets.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneSetDefs from './defs'
 
+const id = 'tools.ozone.set.querySets'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/set/upsertSet.ts b/packages/ozone/src/lexicon/types/tools/ozone/set/upsertSet.ts
index f51e375e425..15af30df6b3 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/set/upsertSet.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/set/upsertSet.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneSetDefs from './defs'
 
+const id = 'tools.ozone.set.upsertSet'
+
 export interface QueryParams {}
 
 export type InputSchema = ToolsOzoneSetDefs.Set
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/setting/defs.ts b/packages/ozone/src/lexicon/types/tools/ozone/setting/defs.ts
index 8a87cbb0e24..c903a0bf88d 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/setting/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/setting/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'tools.ozone.setting.defs'
 
 export interface Option {
   key: string
@@ -24,14 +26,12 @@ export interface Option {
   [k: string]: unknown
 }
 
-export function isOption(v: unknown): v is Option {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.setting.defs#option'
-  )
+export function isOption(
+  v: unknown,
+): v is Option & { $type: $Type<'tools.ozone.setting.defs', 'option'> } {
+  return is$typed(v, id, 'option')
 }
 
-export function validateOption(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.setting.defs#option', v)
+export function validateOption(v: unknown) {
+  return lexicons.validate(`${id}#option`, v) as ValidationResult<Option>
 }
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/setting/listOptions.ts b/packages/ozone/src/lexicon/types/tools/ozone/setting/listOptions.ts
index 54ad9608df3..4d18360c027 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/setting/listOptions.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/setting/listOptions.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneSettingDefs from './defs'
 
+const id = 'tools.ozone.setting.listOptions'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/setting/removeOptions.ts b/packages/ozone/src/lexicon/types/tools/ozone/setting/removeOptions.ts
index 1d653b314da..108b8033ae9 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/setting/removeOptions.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/setting/removeOptions.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'tools.ozone.setting.removeOptions'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/setting/upsertOption.ts b/packages/ozone/src/lexicon/types/tools/ozone/setting/upsertOption.ts
index b2e66d073d9..f0492775e2a 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/setting/upsertOption.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/setting/upsertOption.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneSettingDefs from './defs'
 
+const id = 'tools.ozone.setting.upsertOption'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/signature/defs.ts b/packages/ozone/src/lexicon/types/tools/ozone/signature/defs.ts
index 2c9d9604aaa..0b7bd54997f 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/signature/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/signature/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'tools.ozone.signature.defs'
 
 export interface SigDetail {
   property: string
@@ -12,14 +14,12 @@ export interface SigDetail {
   [k: string]: unknown
 }
 
-export function isSigDetail(v: unknown): v is SigDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.signature.defs#sigDetail'
-  )
+export function isSigDetail(v: unknown): v is SigDetail & {
+  $type: $Type<'tools.ozone.signature.defs', 'sigDetail'>
+} {
+  return is$typed(v, id, 'sigDetail')
 }
 
-export function validateSigDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.signature.defs#sigDetail', v)
+export function validateSigDetail(v: unknown) {
+  return lexicons.validate(`${id}#sigDetail`, v) as ValidationResult<SigDetail>
 }
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/signature/findCorrelation.ts b/packages/ozone/src/lexicon/types/tools/ozone/signature/findCorrelation.ts
index c3eced05a5e..93070d36f52 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/signature/findCorrelation.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/signature/findCorrelation.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneSignatureDefs from './defs'
 
+const id = 'tools.ozone.signature.findCorrelation'
+
 export interface QueryParams {
   dids: string[]
 }
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts b/packages/ozone/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts
index 821d5c6c080..cb00ebb4dae 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts
@@ -3,13 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
 import * as ToolsOzoneSignatureDefs from './defs'
 
+const id = 'tools.ozone.signature.findRelatedAccounts'
+
 export interface QueryParams {
   did: string
   cursor?: string
@@ -55,17 +57,15 @@ export interface RelatedAccount {
   [k: string]: unknown
 }
 
-export function isRelatedAccount(v: unknown): v is RelatedAccount {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.signature.findRelatedAccounts#relatedAccount'
-  )
+export function isRelatedAccount(v: unknown): v is RelatedAccount & {
+  $type: $Type<'tools.ozone.signature.findRelatedAccounts', 'relatedAccount'>
+} {
+  return is$typed(v, id, 'relatedAccount')
 }
 
-export function validateRelatedAccount(v: unknown): ValidationResult {
+export function validateRelatedAccount(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.signature.findRelatedAccounts#relatedAccount',
+    `${id}#relatedAccount`,
     v,
-  )
+  ) as ValidationResult<RelatedAccount>
 }
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/signature/searchAccounts.ts b/packages/ozone/src/lexicon/types/tools/ozone/signature/searchAccounts.ts
index 4e37745aa4a..7b1484c8619 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/signature/searchAccounts.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/signature/searchAccounts.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
 
+const id = 'tools.ozone.signature.searchAccounts'
+
 export interface QueryParams {
   values: string[]
   cursor?: string
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/team/addMember.ts b/packages/ozone/src/lexicon/types/tools/ozone/team/addMember.ts
index 85e40f2a461..288313038be 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/team/addMember.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/team/addMember.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneTeamDefs from './defs'
 
+const id = 'tools.ozone.team.addMember'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/team/defs.ts b/packages/ozone/src/lexicon/types/tools/ozone/team/defs.ts
index b670ecc0a70..d6e51429c77 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/team/defs.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/team/defs.ts
@@ -2,11 +2,13 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
 
+const id = 'tools.ozone.team.defs'
+
 export interface Member {
   did: string
   disabled?: boolean
@@ -22,21 +24,19 @@ export interface Member {
   [k: string]: unknown
 }
 
-export function isMember(v: unknown): v is Member {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.team.defs#member'
-  )
+export function isMember(
+  v: unknown,
+): v is Member & { $type: $Type<'tools.ozone.team.defs', 'member'> } {
+  return is$typed(v, id, 'member')
 }
 
-export function validateMember(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.team.defs#member', v)
+export function validateMember(v: unknown) {
+  return lexicons.validate(`${id}#member`, v) as ValidationResult<Member>
 }
 
 /** Admin role. Highest level of access, can perform all actions. */
-export const ROLEADMIN = 'tools.ozone.team.defs#roleAdmin'
+export const ROLEADMIN = `${id}#roleAdmin`
 /** Moderator role. Can perform most actions. */
-export const ROLEMODERATOR = 'tools.ozone.team.defs#roleModerator'
+export const ROLEMODERATOR = `${id}#roleModerator`
 /** Triage role. Mostly intended for monitoring and escalating issues. */
-export const ROLETRIAGE = 'tools.ozone.team.defs#roleTriage'
+export const ROLETRIAGE = `${id}#roleTriage`
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/team/deleteMember.ts b/packages/ozone/src/lexicon/types/tools/ozone/team/deleteMember.ts
index 3adf03313dc..b6f0c8c2997 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/team/deleteMember.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/team/deleteMember.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'tools.ozone.team.deleteMember'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/team/listMembers.ts b/packages/ozone/src/lexicon/types/tools/ozone/team/listMembers.ts
index 1995cc68cc1..9dffdbad5ce 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/team/listMembers.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/team/listMembers.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneTeamDefs from './defs'
 
+const id = 'tools.ozone.team.listMembers'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/ozone/src/lexicon/types/tools/ozone/team/updateMember.ts b/packages/ozone/src/lexicon/types/tools/ozone/team/updateMember.ts
index 57b0a318583..d770b8fafb3 100644
--- a/packages/ozone/src/lexicon/types/tools/ozone/team/updateMember.ts
+++ b/packages/ozone/src/lexicon/types/tools/ozone/team/updateMember.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneTeamDefs from './defs'
 
+const id = 'tools.ozone.team.updateMember'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/ozone/src/lexicon/util.ts b/packages/ozone/src/lexicon/util.ts
index d7e70440d6e..a8b8cc9e0b7 100644
--- a/packages/ozone/src/lexicon/util.ts
+++ b/packages/ozone/src/lexicon/util.ts
@@ -1,13 +1,39 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-export function isObj(v: unknown): v is Record<string, unknown> {
-  return typeof v === 'object' && v !== null
+export type $Typed<V> = V & { $type: string }
+
+export type $Type<Id extends string, Hash extends string> = Hash extends 'main'
+  ? Id | `${Id}#${Hash}`
+  : `${Id}#${Hash}`
+
+function has$type<V>(v: V): v is $Typed<V & object> {
+  return (
+    v != null &&
+    typeof v === 'object' &&
+    '$type' in v &&
+    typeof v.$type === 'string'
+  )
+}
+
+function check$type<Id extends string, Hash extends string>(
+  $type: string,
+  id: Id,
+  hash: Hash,
+): $type is $Type<Id, Hash> {
+  return $type === id
+    ? hash === 'main'
+    : // $type === `${id}#${hash}`
+      $type.length === id.length + 1 + hash.length &&
+        $type.charCodeAt(id.length) === 35 /* '#' */ &&
+        $type.startsWith(id) &&
+        $type.endsWith(hash)
 }
 
-export function hasProp<K extends PropertyKey>(
-  data: object,
-  prop: K,
-): data is Record<K, unknown> {
-  return prop in data
+export function is$typed<V, Id extends string, Hash extends string>(
+  v: V,
+  id: Id,
+  hash: Hash,
+): v is V & object & { $type: $Type<Id, Hash> } {
+  return has$type(v) && check$type(v.$type, id, hash)
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/defs.ts b/packages/pds/src/lexicon/types/app/bsky/actor/defs.ts
index d1ad4f980c2..8f8e17ba184 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/defs.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as AppBskyGraphDefs from '../graph/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const id = 'app.bsky.actor.defs'
+
 export interface ProfileViewBasic {
   did: string
   handle: string
@@ -21,16 +23,17 @@ export interface ProfileViewBasic {
   [k: string]: unknown
 }
 
-export function isProfileViewBasic(v: unknown): v is ProfileViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileViewBasic'
-  )
+export function isProfileViewBasic(v: unknown): v is ProfileViewBasic & {
+  $type: $Type<'app.bsky.actor.defs', 'profileViewBasic'>
+} {
+  return is$typed(v, id, 'profileViewBasic')
 }
 
-export function validateProfileViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileViewBasic', v)
+export function validateProfileViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileViewBasic`,
+    v,
+  ) as ValidationResult<ProfileViewBasic>
 }
 
 export interface ProfileView {
@@ -47,16 +50,17 @@ export interface ProfileView {
   [k: string]: unknown
 }
 
-export function isProfileView(v: unknown): v is ProfileView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileView'
-  )
+export function isProfileView(
+  v: unknown,
+): v is ProfileView & { $type: $Type<'app.bsky.actor.defs', 'profileView'> } {
+  return is$typed(v, id, 'profileView')
 }
 
-export function validateProfileView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileView', v)
+export function validateProfileView(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileView`,
+    v,
+  ) as ValidationResult<ProfileView>
 }
 
 export interface ProfileViewDetailed {
@@ -79,16 +83,17 @@ export interface ProfileViewDetailed {
   [k: string]: unknown
 }
 
-export function isProfileViewDetailed(v: unknown): v is ProfileViewDetailed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileViewDetailed'
-  )
+export function isProfileViewDetailed(v: unknown): v is ProfileViewDetailed & {
+  $type: $Type<'app.bsky.actor.defs', 'profileViewDetailed'>
+} {
+  return is$typed(v, id, 'profileViewDetailed')
 }
 
-export function validateProfileViewDetailed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileViewDetailed', v)
+export function validateProfileViewDetailed(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileViewDetailed`,
+    v,
+  ) as ValidationResult<ProfileViewDetailed>
 }
 
 export interface ProfileAssociated {
@@ -100,16 +105,17 @@ export interface ProfileAssociated {
   [k: string]: unknown
 }
 
-export function isProfileAssociated(v: unknown): v is ProfileAssociated {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileAssociated'
-  )
+export function isProfileAssociated(v: unknown): v is ProfileAssociated & {
+  $type: $Type<'app.bsky.actor.defs', 'profileAssociated'>
+} {
+  return is$typed(v, id, 'profileAssociated')
 }
 
-export function validateProfileAssociated(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileAssociated', v)
+export function validateProfileAssociated(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileAssociated`,
+    v,
+  ) as ValidationResult<ProfileAssociated>
 }
 
 export interface ProfileAssociatedChat {
@@ -119,16 +125,17 @@ export interface ProfileAssociatedChat {
 
 export function isProfileAssociatedChat(
   v: unknown,
-): v is ProfileAssociatedChat {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#profileAssociatedChat'
-  )
+): v is ProfileAssociatedChat & {
+  $type: $Type<'app.bsky.actor.defs', 'profileAssociatedChat'>
+} {
+  return is$typed(v, id, 'profileAssociatedChat')
 }
 
-export function validateProfileAssociatedChat(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#profileAssociatedChat', v)
+export function validateProfileAssociatedChat(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileAssociatedChat`,
+    v,
+  ) as ValidationResult<ProfileAssociatedChat>
 }
 
 /** Metadata about the requesting account's relationship with the subject account. Only has meaningful content for authed requests. */
@@ -144,16 +151,17 @@ export interface ViewerState {
   [k: string]: unknown
 }
 
-export function isViewerState(v: unknown): v is ViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#viewerState'
-  )
+export function isViewerState(
+  v: unknown,
+): v is ViewerState & { $type: $Type<'app.bsky.actor.defs', 'viewerState'> } {
+  return is$typed(v, id, 'viewerState')
 }
 
-export function validateViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#viewerState', v)
+export function validateViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewerState`,
+    v,
+  ) as ValidationResult<ViewerState>
 }
 
 /** The subject's followers whom you also follow */
@@ -163,16 +171,17 @@ export interface KnownFollowers {
   [k: string]: unknown
 }
 
-export function isKnownFollowers(v: unknown): v is KnownFollowers {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#knownFollowers'
-  )
+export function isKnownFollowers(v: unknown): v is KnownFollowers & {
+  $type: $Type<'app.bsky.actor.defs', 'knownFollowers'>
+} {
+  return is$typed(v, id, 'knownFollowers')
 }
 
-export function validateKnownFollowers(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#knownFollowers', v)
+export function validateKnownFollowers(v: unknown) {
+  return lexicons.validate(
+    `${id}#knownFollowers`,
+    v,
+  ) as ValidationResult<KnownFollowers>
 }
 
 export type Preferences = (
@@ -196,16 +205,17 @@ export interface AdultContentPref {
   [k: string]: unknown
 }
 
-export function isAdultContentPref(v: unknown): v is AdultContentPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#adultContentPref'
-  )
+export function isAdultContentPref(v: unknown): v is AdultContentPref & {
+  $type: $Type<'app.bsky.actor.defs', 'adultContentPref'>
+} {
+  return is$typed(v, id, 'adultContentPref')
 }
 
-export function validateAdultContentPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#adultContentPref', v)
+export function validateAdultContentPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#adultContentPref`,
+    v,
+  ) as ValidationResult<AdultContentPref>
 }
 
 export interface ContentLabelPref {
@@ -216,16 +226,17 @@ export interface ContentLabelPref {
   [k: string]: unknown
 }
 
-export function isContentLabelPref(v: unknown): v is ContentLabelPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#contentLabelPref'
-  )
+export function isContentLabelPref(v: unknown): v is ContentLabelPref & {
+  $type: $Type<'app.bsky.actor.defs', 'contentLabelPref'>
+} {
+  return is$typed(v, id, 'contentLabelPref')
 }
 
-export function validateContentLabelPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#contentLabelPref', v)
+export function validateContentLabelPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#contentLabelPref`,
+    v,
+  ) as ValidationResult<ContentLabelPref>
 }
 
 export interface SavedFeed {
@@ -236,16 +247,14 @@ export interface SavedFeed {
   [k: string]: unknown
 }
 
-export function isSavedFeed(v: unknown): v is SavedFeed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeed'
-  )
+export function isSavedFeed(
+  v: unknown,
+): v is SavedFeed & { $type: $Type<'app.bsky.actor.defs', 'savedFeed'> } {
+  return is$typed(v, id, 'savedFeed')
 }
 
-export function validateSavedFeed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeed', v)
+export function validateSavedFeed(v: unknown) {
+  return lexicons.validate(`${id}#savedFeed`, v) as ValidationResult<SavedFeed>
 }
 
 export interface SavedFeedsPrefV2 {
@@ -253,16 +262,17 @@ export interface SavedFeedsPrefV2 {
   [k: string]: unknown
 }
 
-export function isSavedFeedsPrefV2(v: unknown): v is SavedFeedsPrefV2 {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeedsPrefV2'
-  )
+export function isSavedFeedsPrefV2(v: unknown): v is SavedFeedsPrefV2 & {
+  $type: $Type<'app.bsky.actor.defs', 'savedFeedsPrefV2'>
+} {
+  return is$typed(v, id, 'savedFeedsPrefV2')
 }
 
-export function validateSavedFeedsPrefV2(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeedsPrefV2', v)
+export function validateSavedFeedsPrefV2(v: unknown) {
+  return lexicons.validate(
+    `${id}#savedFeedsPrefV2`,
+    v,
+  ) as ValidationResult<SavedFeedsPrefV2>
 }
 
 export interface SavedFeedsPref {
@@ -272,16 +282,17 @@ export interface SavedFeedsPref {
   [k: string]: unknown
 }
 
-export function isSavedFeedsPref(v: unknown): v is SavedFeedsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#savedFeedsPref'
-  )
+export function isSavedFeedsPref(v: unknown): v is SavedFeedsPref & {
+  $type: $Type<'app.bsky.actor.defs', 'savedFeedsPref'>
+} {
+  return is$typed(v, id, 'savedFeedsPref')
 }
 
-export function validateSavedFeedsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#savedFeedsPref', v)
+export function validateSavedFeedsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#savedFeedsPref`,
+    v,
+  ) as ValidationResult<SavedFeedsPref>
 }
 
 export interface PersonalDetailsPref {
@@ -290,16 +301,17 @@ export interface PersonalDetailsPref {
   [k: string]: unknown
 }
 
-export function isPersonalDetailsPref(v: unknown): v is PersonalDetailsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#personalDetailsPref'
-  )
+export function isPersonalDetailsPref(v: unknown): v is PersonalDetailsPref & {
+  $type: $Type<'app.bsky.actor.defs', 'personalDetailsPref'>
+} {
+  return is$typed(v, id, 'personalDetailsPref')
 }
 
-export function validatePersonalDetailsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#personalDetailsPref', v)
+export function validatePersonalDetailsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#personalDetailsPref`,
+    v,
+  ) as ValidationResult<PersonalDetailsPref>
 }
 
 export interface FeedViewPref {
@@ -318,16 +330,17 @@ export interface FeedViewPref {
   [k: string]: unknown
 }
 
-export function isFeedViewPref(v: unknown): v is FeedViewPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#feedViewPref'
-  )
+export function isFeedViewPref(
+  v: unknown,
+): v is FeedViewPref & { $type: $Type<'app.bsky.actor.defs', 'feedViewPref'> } {
+  return is$typed(v, id, 'feedViewPref')
 }
 
-export function validateFeedViewPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#feedViewPref', v)
+export function validateFeedViewPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#feedViewPref`,
+    v,
+  ) as ValidationResult<FeedViewPref>
 }
 
 export interface ThreadViewPref {
@@ -344,16 +357,17 @@ export interface ThreadViewPref {
   [k: string]: unknown
 }
 
-export function isThreadViewPref(v: unknown): v is ThreadViewPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#threadViewPref'
-  )
+export function isThreadViewPref(v: unknown): v is ThreadViewPref & {
+  $type: $Type<'app.bsky.actor.defs', 'threadViewPref'>
+} {
+  return is$typed(v, id, 'threadViewPref')
 }
 
-export function validateThreadViewPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#threadViewPref', v)
+export function validateThreadViewPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#threadViewPref`,
+    v,
+  ) as ValidationResult<ThreadViewPref>
 }
 
 export interface InterestsPref {
@@ -362,16 +376,17 @@ export interface InterestsPref {
   [k: string]: unknown
 }
 
-export function isInterestsPref(v: unknown): v is InterestsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#interestsPref'
-  )
+export function isInterestsPref(v: unknown): v is InterestsPref & {
+  $type: $Type<'app.bsky.actor.defs', 'interestsPref'>
+} {
+  return is$typed(v, id, 'interestsPref')
 }
 
-export function validateInterestsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#interestsPref', v)
+export function validateInterestsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#interestsPref`,
+    v,
+  ) as ValidationResult<InterestsPref>
 }
 
 export type MutedWordTarget = 'content' | 'tag' | (string & {})
@@ -390,16 +405,14 @@ export interface MutedWord {
   [k: string]: unknown
 }
 
-export function isMutedWord(v: unknown): v is MutedWord {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#mutedWord'
-  )
+export function isMutedWord(
+  v: unknown,
+): v is MutedWord & { $type: $Type<'app.bsky.actor.defs', 'mutedWord'> } {
+  return is$typed(v, id, 'mutedWord')
 }
 
-export function validateMutedWord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#mutedWord', v)
+export function validateMutedWord(v: unknown) {
+  return lexicons.validate(`${id}#mutedWord`, v) as ValidationResult<MutedWord>
 }
 
 export interface MutedWordsPref {
@@ -408,16 +421,17 @@ export interface MutedWordsPref {
   [k: string]: unknown
 }
 
-export function isMutedWordsPref(v: unknown): v is MutedWordsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#mutedWordsPref'
-  )
+export function isMutedWordsPref(v: unknown): v is MutedWordsPref & {
+  $type: $Type<'app.bsky.actor.defs', 'mutedWordsPref'>
+} {
+  return is$typed(v, id, 'mutedWordsPref')
 }
 
-export function validateMutedWordsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#mutedWordsPref', v)
+export function validateMutedWordsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#mutedWordsPref`,
+    v,
+  ) as ValidationResult<MutedWordsPref>
 }
 
 export interface HiddenPostsPref {
@@ -426,16 +440,17 @@ export interface HiddenPostsPref {
   [k: string]: unknown
 }
 
-export function isHiddenPostsPref(v: unknown): v is HiddenPostsPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#hiddenPostsPref'
-  )
+export function isHiddenPostsPref(v: unknown): v is HiddenPostsPref & {
+  $type: $Type<'app.bsky.actor.defs', 'hiddenPostsPref'>
+} {
+  return is$typed(v, id, 'hiddenPostsPref')
 }
 
-export function validateHiddenPostsPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#hiddenPostsPref', v)
+export function validateHiddenPostsPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#hiddenPostsPref`,
+    v,
+  ) as ValidationResult<HiddenPostsPref>
 }
 
 export interface LabelersPref {
@@ -443,16 +458,17 @@ export interface LabelersPref {
   [k: string]: unknown
 }
 
-export function isLabelersPref(v: unknown): v is LabelersPref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#labelersPref'
-  )
+export function isLabelersPref(
+  v: unknown,
+): v is LabelersPref & { $type: $Type<'app.bsky.actor.defs', 'labelersPref'> } {
+  return is$typed(v, id, 'labelersPref')
 }
 
-export function validateLabelersPref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#labelersPref', v)
+export function validateLabelersPref(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelersPref`,
+    v,
+  ) as ValidationResult<LabelersPref>
 }
 
 export interface LabelerPrefItem {
@@ -460,16 +476,17 @@ export interface LabelerPrefItem {
   [k: string]: unknown
 }
 
-export function isLabelerPrefItem(v: unknown): v is LabelerPrefItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#labelerPrefItem'
-  )
+export function isLabelerPrefItem(v: unknown): v is LabelerPrefItem & {
+  $type: $Type<'app.bsky.actor.defs', 'labelerPrefItem'>
+} {
+  return is$typed(v, id, 'labelerPrefItem')
 }
 
-export function validateLabelerPrefItem(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#labelerPrefItem', v)
+export function validateLabelerPrefItem(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerPrefItem`,
+    v,
+  ) as ValidationResult<LabelerPrefItem>
 }
 
 /** A grab bag of state that's specific to the bsky.app program. Third-party apps shouldn't use this. */
@@ -482,16 +499,17 @@ export interface BskyAppStatePref {
   [k: string]: unknown
 }
 
-export function isBskyAppStatePref(v: unknown): v is BskyAppStatePref {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#bskyAppStatePref'
-  )
+export function isBskyAppStatePref(v: unknown): v is BskyAppStatePref & {
+  $type: $Type<'app.bsky.actor.defs', 'bskyAppStatePref'>
+} {
+  return is$typed(v, id, 'bskyAppStatePref')
 }
 
-export function validateBskyAppStatePref(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#bskyAppStatePref', v)
+export function validateBskyAppStatePref(v: unknown) {
+  return lexicons.validate(
+    `${id}#bskyAppStatePref`,
+    v,
+  ) as ValidationResult<BskyAppStatePref>
 }
 
 /** If set, an active progress guide. Once completed, can be set to undefined. Should have unspecced fields tracking progress. */
@@ -500,16 +518,19 @@ export interface BskyAppProgressGuide {
   [k: string]: unknown
 }
 
-export function isBskyAppProgressGuide(v: unknown): v is BskyAppProgressGuide {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.actor.defs#bskyAppProgressGuide'
-  )
+export function isBskyAppProgressGuide(
+  v: unknown,
+): v is BskyAppProgressGuide & {
+  $type: $Type<'app.bsky.actor.defs', 'bskyAppProgressGuide'>
+} {
+  return is$typed(v, id, 'bskyAppProgressGuide')
 }
 
-export function validateBskyAppProgressGuide(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#bskyAppProgressGuide', v)
+export function validateBskyAppProgressGuide(v: unknown) {
+  return lexicons.validate(
+    `${id}#bskyAppProgressGuide`,
+    v,
+  ) as ValidationResult<BskyAppProgressGuide>
 }
 
 /** A new user experiences (NUX) storage object */
@@ -523,12 +544,12 @@ export interface Nux {
   [k: string]: unknown
 }
 
-export function isNux(v: unknown): v is Nux {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.actor.defs#nux'
-  )
+export function isNux(
+  v: unknown,
+): v is Nux & { $type: $Type<'app.bsky.actor.defs', 'nux'> } {
+  return is$typed(v, id, 'nux')
 }
 
-export function validateNux(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.defs#nux', v)
+export function validateNux(v: unknown) {
+  return lexicons.validate(`${id}#nux`, v) as ValidationResult<Nux>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/getPreferences.ts b/packages/pds/src/lexicon/types/app/bsky/actor/getPreferences.ts
index 305e80484be..680cdd0967d 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/getPreferences.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/getPreferences.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+const id = 'app.bsky.actor.getPreferences'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/getProfile.ts b/packages/pds/src/lexicon/types/app/bsky/actor/getProfile.ts
index 5a7b1f25bfc..2ce818e78d1 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/getProfile.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/getProfile.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+const id = 'app.bsky.actor.getProfile'
+
 export interface QueryParams {
   /** Handle or DID of account to fetch profile of. */
   actor: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/getProfiles.ts b/packages/pds/src/lexicon/types/app/bsky/actor/getProfiles.ts
index 16438505654..354d8677cc1 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/getProfiles.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/getProfiles.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+const id = 'app.bsky.actor.getProfiles'
+
 export interface QueryParams {
   actors: string[]
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/getSuggestions.ts b/packages/pds/src/lexicon/types/app/bsky/actor/getSuggestions.ts
index 33b89a18bfa..1690000cb13 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/getSuggestions.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/getSuggestions.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+const id = 'app.bsky.actor.getSuggestions'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/profile.ts b/packages/pds/src/lexicon/types/app/bsky/actor/profile.ts
index 617bdf2cd73..9c71f43c191 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/profile.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/profile.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const id = 'app.bsky.actor.profile'
+
 export interface Record {
   displayName?: string
   /** Free-form profile description text. */
@@ -25,15 +27,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.actor.profile#main' ||
-      v.$type === 'app.bsky.actor.profile')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.actor.profile', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.actor.profile#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/putPreferences.ts b/packages/pds/src/lexicon/types/app/bsky/actor/putPreferences.ts
index 670e752fea3..ecedca7927f 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/putPreferences.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/putPreferences.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+const id = 'app.bsky.actor.putPreferences'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/searchActors.ts b/packages/pds/src/lexicon/types/app/bsky/actor/searchActors.ts
index dcda0c41854..5b788366ee5 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/searchActors.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/searchActors.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+const id = 'app.bsky.actor.searchActors'
+
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead. */
   term?: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts b/packages/pds/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
index 0198b23d790..754e2e8db17 100644
--- a/packages/pds/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/actor/searchActorsTypeahead.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from './defs'
 
+const id = 'app.bsky.actor.searchActorsTypeahead'
+
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead. */
   term?: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/embed/defs.ts b/packages/pds/src/lexicon/types/app/bsky/embed/defs.ts
index cc253f9e610..299c6f4e414 100644
--- a/packages/pds/src/lexicon/types/app/bsky/embed/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/embed/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.embed.defs'
 
 /** width:height represents an aspect ratio. It may be approximate, and may not correspond to absolute dimensions in any given unit. */
 export interface AspectRatio {
@@ -13,14 +15,15 @@ export interface AspectRatio {
   [k: string]: unknown
 }
 
-export function isAspectRatio(v: unknown): v is AspectRatio {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.defs#aspectRatio'
-  )
+export function isAspectRatio(
+  v: unknown,
+): v is AspectRatio & { $type: $Type<'app.bsky.embed.defs', 'aspectRatio'> } {
+  return is$typed(v, id, 'aspectRatio')
 }
 
-export function validateAspectRatio(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.defs#aspectRatio', v)
+export function validateAspectRatio(v: unknown) {
+  return lexicons.validate(
+    `${id}#aspectRatio`,
+    v,
+  ) as ValidationResult<AspectRatio>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/embed/external.ts b/packages/pds/src/lexicon/types/app/bsky/embed/external.ts
index b137ee4b6f5..205bc5280c9 100644
--- a/packages/pds/src/lexicon/types/app/bsky/embed/external.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/embed/external.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.embed.external'
 
 /** A representation of some externally linked content (eg, a URL and 'card'), embedded in a Bluesky record (eg, a post). */
 export interface Main {
@@ -12,17 +14,14 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.external#main' ||
-      v.$type === 'app.bsky.embed.external')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: $Type<'app.bsky.embed.external', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface External {
@@ -33,16 +32,14 @@ export interface External {
   [k: string]: unknown
 }
 
-export function isExternal(v: unknown): v is External {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#external'
-  )
+export function isExternal(
+  v: unknown,
+): v is External & { $type: $Type<'app.bsky.embed.external', 'external'> } {
+  return is$typed(v, id, 'external')
 }
 
-export function validateExternal(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#external', v)
+export function validateExternal(v: unknown) {
+  return lexicons.validate(`${id}#external`, v) as ValidationResult<External>
 }
 
 export interface View {
@@ -50,16 +47,14 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: $Type<'app.bsky.embed.external', 'view'> } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
 
 export interface ViewExternal {
@@ -70,14 +65,15 @@ export interface ViewExternal {
   [k: string]: unknown
 }
 
-export function isViewExternal(v: unknown): v is ViewExternal {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.external#viewExternal'
-  )
+export function isViewExternal(v: unknown): v is ViewExternal & {
+  $type: $Type<'app.bsky.embed.external', 'viewExternal'>
+} {
+  return is$typed(v, id, 'viewExternal')
 }
 
-export function validateViewExternal(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.external#viewExternal', v)
+export function validateViewExternal(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewExternal`,
+    v,
+  ) as ValidationResult<ViewExternal>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/embed/images.ts b/packages/pds/src/lexicon/types/app/bsky/embed/images.ts
index 1fddf42f8eb..0fd622ba6c2 100644
--- a/packages/pds/src/lexicon/types/app/bsky/embed/images.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/embed/images.ts
@@ -2,27 +2,26 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyEmbedDefs from './defs'
 
+const id = 'app.bsky.embed.images'
+
 export interface Main {
   images: Image[]
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.images#main' ||
-      v.$type === 'app.bsky.embed.images')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: $Type<'app.bsky.embed.images', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface Image {
@@ -33,14 +32,14 @@ export interface Image {
   [k: string]: unknown
 }
 
-export function isImage(v: unknown): v is Image {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.images#image'
-  )
+export function isImage(
+  v: unknown,
+): v is Image & { $type: $Type<'app.bsky.embed.images', 'image'> } {
+  return is$typed(v, id, 'image')
 }
 
-export function validateImage(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#image', v)
+export function validateImage(v: unknown) {
+  return lexicons.validate(`${id}#image`, v) as ValidationResult<Image>
 }
 
 export interface View {
@@ -48,14 +47,14 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.images#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: $Type<'app.bsky.embed.images', 'view'> } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
 
 export interface ViewImage {
@@ -69,14 +68,12 @@ export interface ViewImage {
   [k: string]: unknown
 }
 
-export function isViewImage(v: unknown): v is ViewImage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.images#viewImage'
-  )
+export function isViewImage(
+  v: unknown,
+): v is ViewImage & { $type: $Type<'app.bsky.embed.images', 'viewImage'> } {
+  return is$typed(v, id, 'viewImage')
 }
 
-export function validateViewImage(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.images#viewImage', v)
+export function validateViewImage(v: unknown) {
+  return lexicons.validate(`${id}#viewImage`, v) as ValidationResult<ViewImage>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/embed/record.ts b/packages/pds/src/lexicon/types/app/bsky/embed/record.ts
index 452c8fb7f71..d296b291fb8 100644
--- a/packages/pds/src/lexicon/types/app/bsky/embed/record.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/embed/record.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 import * as AppBskyFeedDefs from '../feed/defs'
 import * as AppBskyGraphDefs from '../graph/defs'
@@ -16,22 +16,21 @@ import * as AppBskyEmbedVideo from './video'
 import * as AppBskyEmbedExternal from './external'
 import * as AppBskyEmbedRecordWithMedia from './recordWithMedia'
 
+const id = 'app.bsky.embed.record'
+
 export interface Main {
   record: ComAtprotoRepoStrongRef.Main
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.record#main' ||
-      v.$type === 'app.bsky.embed.record')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: $Type<'app.bsky.embed.record', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface View {
@@ -48,14 +47,14 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.record#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: $Type<'app.bsky.embed.record', 'view'> } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
 
 export interface ViewRecord {
@@ -81,16 +80,17 @@ export interface ViewRecord {
   [k: string]: unknown
 }
 
-export function isViewRecord(v: unknown): v is ViewRecord {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewRecord'
-  )
+export function isViewRecord(
+  v: unknown,
+): v is ViewRecord & { $type: $Type<'app.bsky.embed.record', 'viewRecord'> } {
+  return is$typed(v, id, 'viewRecord')
 }
 
-export function validateViewRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewRecord', v)
+export function validateViewRecord(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewRecord`,
+    v,
+  ) as ValidationResult<ViewRecord>
 }
 
 export interface ViewNotFound {
@@ -99,16 +99,17 @@ export interface ViewNotFound {
   [k: string]: unknown
 }
 
-export function isViewNotFound(v: unknown): v is ViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewNotFound'
-  )
+export function isViewNotFound(v: unknown): v is ViewNotFound & {
+  $type: $Type<'app.bsky.embed.record', 'viewNotFound'>
+} {
+  return is$typed(v, id, 'viewNotFound')
 }
 
-export function validateViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewNotFound', v)
+export function validateViewNotFound(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewNotFound`,
+    v,
+  ) as ValidationResult<ViewNotFound>
 }
 
 export interface ViewBlocked {
@@ -118,16 +119,17 @@ export interface ViewBlocked {
   [k: string]: unknown
 }
 
-export function isViewBlocked(v: unknown): v is ViewBlocked {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewBlocked'
-  )
+export function isViewBlocked(
+  v: unknown,
+): v is ViewBlocked & { $type: $Type<'app.bsky.embed.record', 'viewBlocked'> } {
+  return is$typed(v, id, 'viewBlocked')
 }
 
-export function validateViewBlocked(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewBlocked', v)
+export function validateViewBlocked(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewBlocked`,
+    v,
+  ) as ValidationResult<ViewBlocked>
 }
 
 export interface ViewDetached {
@@ -136,14 +138,15 @@ export interface ViewDetached {
   [k: string]: unknown
 }
 
-export function isViewDetached(v: unknown): v is ViewDetached {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.record#viewDetached'
-  )
+export function isViewDetached(v: unknown): v is ViewDetached & {
+  $type: $Type<'app.bsky.embed.record', 'viewDetached'>
+} {
+  return is$typed(v, id, 'viewDetached')
 }
 
-export function validateViewDetached(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.record#viewDetached', v)
+export function validateViewDetached(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewDetached`,
+    v,
+  ) as ValidationResult<ViewDetached>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/embed/recordWithMedia.ts b/packages/pds/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
index 4df0ee5c2d7..9af46777257 100644
--- a/packages/pds/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/embed/recordWithMedia.ts
@@ -2,14 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyEmbedRecord from './record'
 import * as AppBskyEmbedImages from './images'
 import * as AppBskyEmbedVideo from './video'
 import * as AppBskyEmbedExternal from './external'
 
+const id = 'app.bsky.embed.recordWithMedia'
+
 export interface Main {
   record: AppBskyEmbedRecord.Main
   media:
@@ -20,17 +22,14 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.recordWithMedia#main' ||
-      v.$type === 'app.bsky.embed.recordWithMedia')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: $Type<'app.bsky.embed.recordWithMedia', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.recordWithMedia#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface View {
@@ -43,14 +42,12 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.recordWithMedia#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: $Type<'app.bsky.embed.recordWithMedia', 'view'> } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.recordWithMedia#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/embed/video.ts b/packages/pds/src/lexicon/types/app/bsky/embed/video.ts
index 50eb59aa038..e504f8adce9 100644
--- a/packages/pds/src/lexicon/types/app/bsky/embed/video.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/embed/video.ts
@@ -2,11 +2,13 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyEmbedDefs from './defs'
 
+const id = 'app.bsky.embed.video'
+
 export interface Main {
   video: BlobRef
   captions?: Caption[]
@@ -16,17 +18,14 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.embed.video#main' ||
-      v.$type === 'app.bsky.embed.video')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: $Type<'app.bsky.embed.video', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 export interface Caption {
@@ -35,16 +34,14 @@ export interface Caption {
   [k: string]: unknown
 }
 
-export function isCaption(v: unknown): v is Caption {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.embed.video#caption'
-  )
+export function isCaption(
+  v: unknown,
+): v is Caption & { $type: $Type<'app.bsky.embed.video', 'caption'> } {
+  return is$typed(v, id, 'caption')
 }
 
-export function validateCaption(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#caption', v)
+export function validateCaption(v: unknown) {
+  return lexicons.validate(`${id}#caption`, v) as ValidationResult<Caption>
 }
 
 export interface View {
@@ -56,12 +53,12 @@ export interface View {
   [k: string]: unknown
 }
 
-export function isView(v: unknown): v is View {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.video#view'
-  )
+export function isView(
+  v: unknown,
+): v is View & { $type: $Type<'app.bsky.embed.video', 'view'> } {
+  return is$typed(v, id, 'view')
 }
 
-export function validateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.embed.video#view', v)
+export function validateView(v: unknown) {
+  return lexicons.validate(`${id}#view`, v) as ValidationResult<View>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/defs.ts b/packages/pds/src/lexicon/types/app/bsky/feed/defs.ts
index 1c6f6ce78f6..076792ac3c8 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/defs.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as AppBskyEmbedImages from '../embed/images'
 import * as AppBskyEmbedVideo from '../embed/video'
@@ -15,6 +15,8 @@ import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as AppBskyGraphDefs from '../graph/defs'
 
+const id = 'app.bsky.feed.defs'
+
 export interface PostView {
   uri: string
   cid: string
@@ -38,14 +40,14 @@ export interface PostView {
   [k: string]: unknown
 }
 
-export function isPostView(v: unknown): v is PostView {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.defs#postView'
-  )
+export function isPostView(
+  v: unknown,
+): v is PostView & { $type: $Type<'app.bsky.feed.defs', 'postView'> } {
+  return is$typed(v, id, 'postView')
 }
 
-export function validatePostView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#postView', v)
+export function validatePostView(v: unknown) {
+  return lexicons.validate(`${id}#postView`, v) as ValidationResult<PostView>
 }
 
 /** Metadata about the requesting account's relationship with the subject content. Only has meaningful content for authed requests. */
@@ -59,16 +61,17 @@ export interface ViewerState {
   [k: string]: unknown
 }
 
-export function isViewerState(v: unknown): v is ViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#viewerState'
-  )
+export function isViewerState(
+  v: unknown,
+): v is ViewerState & { $type: $Type<'app.bsky.feed.defs', 'viewerState'> } {
+  return is$typed(v, id, 'viewerState')
 }
 
-export function validateViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#viewerState', v)
+export function validateViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewerState`,
+    v,
+  ) as ValidationResult<ViewerState>
 }
 
 export interface FeedViewPost {
@@ -80,16 +83,17 @@ export interface FeedViewPost {
   [k: string]: unknown
 }
 
-export function isFeedViewPost(v: unknown): v is FeedViewPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#feedViewPost'
-  )
+export function isFeedViewPost(
+  v: unknown,
+): v is FeedViewPost & { $type: $Type<'app.bsky.feed.defs', 'feedViewPost'> } {
+  return is$typed(v, id, 'feedViewPost')
 }
 
-export function validateFeedViewPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#feedViewPost', v)
+export function validateFeedViewPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#feedViewPost`,
+    v,
+  ) as ValidationResult<FeedViewPost>
 }
 
 export interface ReplyRef {
@@ -107,14 +111,14 @@ export interface ReplyRef {
   [k: string]: unknown
 }
 
-export function isReplyRef(v: unknown): v is ReplyRef {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.defs#replyRef'
-  )
+export function isReplyRef(
+  v: unknown,
+): v is ReplyRef & { $type: $Type<'app.bsky.feed.defs', 'replyRef'> } {
+  return is$typed(v, id, 'replyRef')
 }
 
-export function validateReplyRef(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#replyRef', v)
+export function validateReplyRef(v: unknown) {
+  return lexicons.validate(`${id}#replyRef`, v) as ValidationResult<ReplyRef>
 }
 
 export interface ReasonRepost {
@@ -123,32 +127,31 @@ export interface ReasonRepost {
   [k: string]: unknown
 }
 
-export function isReasonRepost(v: unknown): v is ReasonRepost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#reasonRepost'
-  )
+export function isReasonRepost(
+  v: unknown,
+): v is ReasonRepost & { $type: $Type<'app.bsky.feed.defs', 'reasonRepost'> } {
+  return is$typed(v, id, 'reasonRepost')
 }
 
-export function validateReasonRepost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#reasonRepost', v)
+export function validateReasonRepost(v: unknown) {
+  return lexicons.validate(
+    `${id}#reasonRepost`,
+    v,
+  ) as ValidationResult<ReasonRepost>
 }
 
 export interface ReasonPin {
   [k: string]: unknown
 }
 
-export function isReasonPin(v: unknown): v is ReasonPin {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#reasonPin'
-  )
+export function isReasonPin(
+  v: unknown,
+): v is ReasonPin & { $type: $Type<'app.bsky.feed.defs', 'reasonPin'> } {
+  return is$typed(v, id, 'reasonPin')
 }
 
-export function validateReasonPin(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#reasonPin', v)
+export function validateReasonPin(v: unknown) {
+  return lexicons.validate(`${id}#reasonPin`, v) as ValidationResult<ReasonPin>
 }
 
 export interface ThreadViewPost {
@@ -167,16 +170,17 @@ export interface ThreadViewPost {
   [k: string]: unknown
 }
 
-export function isThreadViewPost(v: unknown): v is ThreadViewPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#threadViewPost'
-  )
+export function isThreadViewPost(v: unknown): v is ThreadViewPost & {
+  $type: $Type<'app.bsky.feed.defs', 'threadViewPost'>
+} {
+  return is$typed(v, id, 'threadViewPost')
 }
 
-export function validateThreadViewPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#threadViewPost', v)
+export function validateThreadViewPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#threadViewPost`,
+    v,
+  ) as ValidationResult<ThreadViewPost>
 }
 
 export interface NotFoundPost {
@@ -185,16 +189,17 @@ export interface NotFoundPost {
   [k: string]: unknown
 }
 
-export function isNotFoundPost(v: unknown): v is NotFoundPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#notFoundPost'
-  )
+export function isNotFoundPost(
+  v: unknown,
+): v is NotFoundPost & { $type: $Type<'app.bsky.feed.defs', 'notFoundPost'> } {
+  return is$typed(v, id, 'notFoundPost')
 }
 
-export function validateNotFoundPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#notFoundPost', v)
+export function validateNotFoundPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#notFoundPost`,
+    v,
+  ) as ValidationResult<NotFoundPost>
 }
 
 export interface BlockedPost {
@@ -204,16 +209,17 @@ export interface BlockedPost {
   [k: string]: unknown
 }
 
-export function isBlockedPost(v: unknown): v is BlockedPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#blockedPost'
-  )
+export function isBlockedPost(
+  v: unknown,
+): v is BlockedPost & { $type: $Type<'app.bsky.feed.defs', 'blockedPost'> } {
+  return is$typed(v, id, 'blockedPost')
 }
 
-export function validateBlockedPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#blockedPost', v)
+export function validateBlockedPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#blockedPost`,
+    v,
+  ) as ValidationResult<BlockedPost>
 }
 
 export interface BlockedAuthor {
@@ -222,16 +228,17 @@ export interface BlockedAuthor {
   [k: string]: unknown
 }
 
-export function isBlockedAuthor(v: unknown): v is BlockedAuthor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#blockedAuthor'
-  )
+export function isBlockedAuthor(v: unknown): v is BlockedAuthor & {
+  $type: $Type<'app.bsky.feed.defs', 'blockedAuthor'>
+} {
+  return is$typed(v, id, 'blockedAuthor')
 }
 
-export function validateBlockedAuthor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#blockedAuthor', v)
+export function validateBlockedAuthor(v: unknown) {
+  return lexicons.validate(
+    `${id}#blockedAuthor`,
+    v,
+  ) as ValidationResult<BlockedAuthor>
 }
 
 export interface GeneratorView {
@@ -251,16 +258,17 @@ export interface GeneratorView {
   [k: string]: unknown
 }
 
-export function isGeneratorView(v: unknown): v is GeneratorView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#generatorView'
-  )
+export function isGeneratorView(v: unknown): v is GeneratorView & {
+  $type: $Type<'app.bsky.feed.defs', 'generatorView'>
+} {
+  return is$typed(v, id, 'generatorView')
 }
 
-export function validateGeneratorView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#generatorView', v)
+export function validateGeneratorView(v: unknown) {
+  return lexicons.validate(
+    `${id}#generatorView`,
+    v,
+  ) as ValidationResult<GeneratorView>
 }
 
 export interface GeneratorViewerState {
@@ -268,16 +276,19 @@ export interface GeneratorViewerState {
   [k: string]: unknown
 }
 
-export function isGeneratorViewerState(v: unknown): v is GeneratorViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#generatorViewerState'
-  )
+export function isGeneratorViewerState(
+  v: unknown,
+): v is GeneratorViewerState & {
+  $type: $Type<'app.bsky.feed.defs', 'generatorViewerState'>
+} {
+  return is$typed(v, id, 'generatorViewerState')
 }
 
-export function validateGeneratorViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#generatorViewerState', v)
+export function validateGeneratorViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#generatorViewerState`,
+    v,
+  ) as ValidationResult<GeneratorViewerState>
 }
 
 export interface SkeletonFeedPost {
@@ -291,16 +302,17 @@ export interface SkeletonFeedPost {
   [k: string]: unknown
 }
 
-export function isSkeletonFeedPost(v: unknown): v is SkeletonFeedPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonFeedPost'
-  )
+export function isSkeletonFeedPost(v: unknown): v is SkeletonFeedPost & {
+  $type: $Type<'app.bsky.feed.defs', 'skeletonFeedPost'>
+} {
+  return is$typed(v, id, 'skeletonFeedPost')
 }
 
-export function validateSkeletonFeedPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonFeedPost', v)
+export function validateSkeletonFeedPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonFeedPost`,
+    v,
+  ) as ValidationResult<SkeletonFeedPost>
 }
 
 export interface SkeletonReasonRepost {
@@ -308,32 +320,36 @@ export interface SkeletonReasonRepost {
   [k: string]: unknown
 }
 
-export function isSkeletonReasonRepost(v: unknown): v is SkeletonReasonRepost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonReasonRepost'
-  )
+export function isSkeletonReasonRepost(
+  v: unknown,
+): v is SkeletonReasonRepost & {
+  $type: $Type<'app.bsky.feed.defs', 'skeletonReasonRepost'>
+} {
+  return is$typed(v, id, 'skeletonReasonRepost')
 }
 
-export function validateSkeletonReasonRepost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonReasonRepost', v)
+export function validateSkeletonReasonRepost(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonReasonRepost`,
+    v,
+  ) as ValidationResult<SkeletonReasonRepost>
 }
 
 export interface SkeletonReasonPin {
   [k: string]: unknown
 }
 
-export function isSkeletonReasonPin(v: unknown): v is SkeletonReasonPin {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#skeletonReasonPin'
-  )
+export function isSkeletonReasonPin(v: unknown): v is SkeletonReasonPin & {
+  $type: $Type<'app.bsky.feed.defs', 'skeletonReasonPin'>
+} {
+  return is$typed(v, id, 'skeletonReasonPin')
 }
 
-export function validateSkeletonReasonPin(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#skeletonReasonPin', v)
+export function validateSkeletonReasonPin(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonReasonPin`,
+    v,
+  ) as ValidationResult<SkeletonReasonPin>
 }
 
 export interface ThreadgateView {
@@ -344,16 +360,17 @@ export interface ThreadgateView {
   [k: string]: unknown
 }
 
-export function isThreadgateView(v: unknown): v is ThreadgateView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#threadgateView'
-  )
+export function isThreadgateView(v: unknown): v is ThreadgateView & {
+  $type: $Type<'app.bsky.feed.defs', 'threadgateView'>
+} {
+  return is$typed(v, id, 'threadgateView')
 }
 
-export function validateThreadgateView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#threadgateView', v)
+export function validateThreadgateView(v: unknown) {
+  return lexicons.validate(
+    `${id}#threadgateView`,
+    v,
+  ) as ValidationResult<ThreadgateView>
 }
 
 export interface Interaction {
@@ -377,39 +394,40 @@ export interface Interaction {
   [k: string]: unknown
 }
 
-export function isInteraction(v: unknown): v is Interaction {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#interaction'
-  )
+export function isInteraction(
+  v: unknown,
+): v is Interaction & { $type: $Type<'app.bsky.feed.defs', 'interaction'> } {
+  return is$typed(v, id, 'interaction')
 }
 
-export function validateInteraction(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#interaction', v)
+export function validateInteraction(v: unknown) {
+  return lexicons.validate(
+    `${id}#interaction`,
+    v,
+  ) as ValidationResult<Interaction>
 }
 
 /** Request that less content like the given feed item be shown in the feed */
-export const REQUESTLESS = 'app.bsky.feed.defs#requestLess'
+export const REQUESTLESS = `${id}#requestLess`
 /** Request that more content like the given feed item be shown in the feed */
-export const REQUESTMORE = 'app.bsky.feed.defs#requestMore'
+export const REQUESTMORE = `${id}#requestMore`
 /** User clicked through to the feed item */
-export const CLICKTHROUGHITEM = 'app.bsky.feed.defs#clickthroughItem'
+export const CLICKTHROUGHITEM = `${id}#clickthroughItem`
 /** User clicked through to the author of the feed item */
-export const CLICKTHROUGHAUTHOR = 'app.bsky.feed.defs#clickthroughAuthor'
+export const CLICKTHROUGHAUTHOR = `${id}#clickthroughAuthor`
 /** User clicked through to the reposter of the feed item */
-export const CLICKTHROUGHREPOSTER = 'app.bsky.feed.defs#clickthroughReposter'
+export const CLICKTHROUGHREPOSTER = `${id}#clickthroughReposter`
 /** User clicked through to the embedded content of the feed item */
-export const CLICKTHROUGHEMBED = 'app.bsky.feed.defs#clickthroughEmbed'
+export const CLICKTHROUGHEMBED = `${id}#clickthroughEmbed`
 /** Feed item was seen by user */
-export const INTERACTIONSEEN = 'app.bsky.feed.defs#interactionSeen'
+export const INTERACTIONSEEN = `${id}#interactionSeen`
 /** User liked the feed item */
-export const INTERACTIONLIKE = 'app.bsky.feed.defs#interactionLike'
+export const INTERACTIONLIKE = `${id}#interactionLike`
 /** User reposted the feed item */
-export const INTERACTIONREPOST = 'app.bsky.feed.defs#interactionRepost'
+export const INTERACTIONREPOST = `${id}#interactionRepost`
 /** User replied to the feed item */
-export const INTERACTIONREPLY = 'app.bsky.feed.defs#interactionReply'
+export const INTERACTIONREPLY = `${id}#interactionReply`
 /** User quoted the feed item */
-export const INTERACTIONQUOTE = 'app.bsky.feed.defs#interactionQuote'
+export const INTERACTIONQUOTE = `${id}#interactionQuote`
 /** User shared the feed item */
-export const INTERACTIONSHARE = 'app.bsky.feed.defs#interactionShare'
+export const INTERACTIONSHARE = `${id}#interactionShare`
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts b/packages/pds/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
index 5bf8699a3ca..b2f3af11a08 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/describeFeedGenerator.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.feed.describeFeedGenerator'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -49,16 +51,14 @@ export interface Feed {
   [k: string]: unknown
 }
 
-export function isFeed(v: unknown): v is Feed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.describeFeedGenerator#feed'
-  )
+export function isFeed(
+  v: unknown,
+): v is Feed & { $type: $Type<'app.bsky.feed.describeFeedGenerator', 'feed'> } {
+  return is$typed(v, id, 'feed')
 }
 
-export function validateFeed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.describeFeedGenerator#feed', v)
+export function validateFeed(v: unknown) {
+  return lexicons.validate(`${id}#feed`, v) as ValidationResult<Feed>
 }
 
 export interface Links {
@@ -67,14 +67,12 @@ export interface Links {
   [k: string]: unknown
 }
 
-export function isLinks(v: unknown): v is Links {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.describeFeedGenerator#links'
-  )
+export function isLinks(v: unknown): v is Links & {
+  $type: $Type<'app.bsky.feed.describeFeedGenerator', 'links'>
+} {
+  return is$typed(v, id, 'links')
 }
 
-export function validateLinks(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.describeFeedGenerator#links', v)
+export function validateLinks(v: unknown) {
+  return lexicons.validate(`${id}#links`, v) as ValidationResult<Links>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/generator.ts b/packages/pds/src/lexicon/types/app/bsky/feed/generator.ts
index eb8e8d0f633..2fac60cbf6e 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/generator.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/generator.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const id = 'app.bsky.feed.generator'
+
 export interface Record {
   did: string
   displayName: string
@@ -23,15 +25,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.generator#main' ||
-      v.$type === 'app.bsky.feed.generator')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.feed.generator', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.generator#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getActorFeeds.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
index 0b8afff4ec8..a680bebbc7e 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getActorFeeds.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getActorFeeds'
+
 export interface QueryParams {
   actor: string
   limit: number
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getActorLikes.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getActorLikes.ts
index da315ae33c7..5d2852087d7 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getActorLikes.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getActorLikes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getActorLikes'
+
 export interface QueryParams {
   actor: string
   limit: number
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
index 60fa2f74f92..7719ac0368a 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getAuthorFeed'
+
 export interface QueryParams {
   actor: string
   limit: number
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getFeed.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getFeed.ts
index e03913a6fb3..9224f829059 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getFeed.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getFeed.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getFeed'
+
 export interface QueryParams {
   feed: string
   limit: number
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
index 7ab89057a8c..c3981ea75b4 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerator.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getFeedGenerator'
+
 export interface QueryParams {
   /** AT-URI of the feed generator record. */
   feed: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
index 21963a91e2e..4745177b4b5 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getFeedGenerators.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getFeedGenerators'
+
 export interface QueryParams {
   feeds: string[]
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
index ca1cef20f08..07eba8c59f4 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getFeedSkeleton'
+
 export interface QueryParams {
   /** Reference to feed generator record describing the specific feed being requested. */
   feed: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getLikes.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getLikes.ts
index 275d99bba3d..190905772f5 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getLikes.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getLikes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.feed.getLikes'
+
 export interface QueryParams {
   /** AT-URI of the subject (eg, a post record). */
   uri: string
@@ -60,12 +62,12 @@ export interface Like {
   [k: string]: unknown
 }
 
-export function isLike(v: unknown): v is Like {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.getLikes#like'
-  )
+export function isLike(
+  v: unknown,
+): v is Like & { $type: $Type<'app.bsky.feed.getLikes', 'like'> } {
+  return is$typed(v, id, 'like')
 }
 
-export function validateLike(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.getLikes#like', v)
+export function validateLike(v: unknown) {
+  return lexicons.validate(`${id}#like`, v) as ValidationResult<Like>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getListFeed.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getListFeed.ts
index 84e12deaa92..a31bb6ddd62 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getListFeed.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getListFeed.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getListFeed'
+
 export interface QueryParams {
   /** Reference (AT-URI) to the list record. */
   list: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getPostThread.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getPostThread.ts
index 768977193ef..444eac417c3 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getPostThread.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getPostThread.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getPostThread'
+
 export interface QueryParams {
   /** Reference (AT-URI) to post record. */
   uri: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getPosts.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getPosts.ts
index 85000c74787..da6bf3696e2 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getPosts.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getPosts.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getPosts'
+
 export interface QueryParams {
   /** List of post AT-URIs to return hydrated views for. */
   uris: string[]
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getQuotes.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getQuotes.ts
index 38d04ad88c1..c71113bace2 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getQuotes.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getQuotes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getQuotes'
+
 export interface QueryParams {
   /** Reference (AT-URI) of post record */
   uri: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getRepostedBy.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
index 40e008815d9..25bf3c8f81b 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getRepostedBy.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.feed.getRepostedBy'
+
 export interface QueryParams {
   /** Reference (AT-URI) of post record */
   uri: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
index d1ec590f33d..c34be54afdc 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getSuggestedFeeds.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getSuggestedFeeds'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/getTimeline.ts b/packages/pds/src/lexicon/types/app/bsky/feed/getTimeline.ts
index 5202c9eb6e3..e3f1f0ce0bc 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/getTimeline.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/getTimeline.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.getTimeline'
+
 export interface QueryParams {
   /** Variant 'algorithm' for timeline. Implementation-specific. NOTE: most feed flexibility has been moved to feed generator mechanism. */
   algorithm?: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/like.ts b/packages/pds/src/lexicon/types/app/bsky/feed/like.ts
index 1da9dd940dc..17f3d126a33 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/like.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/like.ts
@@ -2,25 +2,25 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const id = 'app.bsky.feed.like'
+
 export interface Record {
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.like#main' || v.$type === 'app.bsky.feed.like')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.feed.like', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.like#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/post.ts b/packages/pds/src/lexicon/types/app/bsky/feed/post.ts
index f9f2827c8d0..cc632e3e4c8 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/post.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/post.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as AppBskyEmbedImages from '../embed/images'
 import * as AppBskyEmbedVideo from '../embed/video'
@@ -14,6 +14,8 @@ import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const id = 'app.bsky.feed.post'
+
 export interface Record {
   /** The primary post content. May be an empty string, if there are embeds. */
   text: string
@@ -41,16 +43,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.post#main' || v.$type === 'app.bsky.feed.post')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.feed.post', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 export interface ReplyRef {
@@ -59,14 +59,14 @@ export interface ReplyRef {
   [k: string]: unknown
 }
 
-export function isReplyRef(v: unknown): v is ReplyRef {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.post#replyRef'
-  )
+export function isReplyRef(
+  v: unknown,
+): v is ReplyRef & { $type: $Type<'app.bsky.feed.post', 'replyRef'> } {
+  return is$typed(v, id, 'replyRef')
 }
 
-export function validateReplyRef(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#replyRef', v)
+export function validateReplyRef(v: unknown) {
+  return lexicons.validate(`${id}#replyRef`, v) as ValidationResult<ReplyRef>
 }
 
 /** Deprecated: use facets instead. */
@@ -78,14 +78,14 @@ export interface Entity {
   [k: string]: unknown
 }
 
-export function isEntity(v: unknown): v is Entity {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.feed.post#entity'
-  )
+export function isEntity(
+  v: unknown,
+): v is Entity & { $type: $Type<'app.bsky.feed.post', 'entity'> } {
+  return is$typed(v, id, 'entity')
 }
 
-export function validateEntity(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#entity', v)
+export function validateEntity(v: unknown) {
+  return lexicons.validate(`${id}#entity`, v) as ValidationResult<Entity>
 }
 
 /** Deprecated. Use app.bsky.richtext instead -- A text segment. Start is inclusive, end is exclusive. Indices are for utf16-encoded strings. */
@@ -95,14 +95,12 @@ export interface TextSlice {
   [k: string]: unknown
 }
 
-export function isTextSlice(v: unknown): v is TextSlice {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.post#textSlice'
-  )
+export function isTextSlice(
+  v: unknown,
+): v is TextSlice & { $type: $Type<'app.bsky.feed.post', 'textSlice'> } {
+  return is$typed(v, id, 'textSlice')
 }
 
-export function validateTextSlice(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.post#textSlice', v)
+export function validateTextSlice(v: unknown) {
+  return lexicons.validate(`${id}#textSlice`, v) as ValidationResult<TextSlice>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/postgate.ts b/packages/pds/src/lexicon/types/app/bsky/feed/postgate.ts
index dcc4c22a425..aa757b8281d 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/postgate.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/postgate.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.feed.postgate'
 
 export interface Record {
   createdAt: string
@@ -16,17 +18,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.postgate#main' ||
-      v.$type === 'app.bsky.feed.postgate')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.feed.postgate', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.postgate#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 /** Disables embedding of this post. */
@@ -34,14 +33,15 @@ export interface DisableRule {
   [k: string]: unknown
 }
 
-export function isDisableRule(v: unknown): v is DisableRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.postgate#disableRule'
-  )
+export function isDisableRule(v: unknown): v is DisableRule & {
+  $type: $Type<'app.bsky.feed.postgate', 'disableRule'>
+} {
+  return is$typed(v, id, 'disableRule')
 }
 
-export function validateDisableRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.postgate#disableRule', v)
+export function validateDisableRule(v: unknown) {
+  return lexicons.validate(
+    `${id}#disableRule`,
+    v,
+  ) as ValidationResult<DisableRule>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/repost.ts b/packages/pds/src/lexicon/types/app/bsky/feed/repost.ts
index 4c836d76e2a..0f1101898d5 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/repost.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/repost.ts
@@ -2,26 +2,25 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const id = 'app.bsky.feed.repost'
+
 export interface Record {
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.repost#main' ||
-      v.$type === 'app.bsky.feed.repost')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.feed.repost', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.repost#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/searchPosts.ts b/packages/pds/src/lexicon/types/app/bsky/feed/searchPosts.ts
index 14efa5276f8..50152c309ae 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/searchPosts.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/searchPosts.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.searchPosts'
+
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
   q: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/sendInteractions.ts b/packages/pds/src/lexicon/types/app/bsky/feed/sendInteractions.ts
index c22fc1cb2fb..59bc2c698b8 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/sendInteractions.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/sendInteractions.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from './defs'
 
+const id = 'app.bsky.feed.sendInteractions'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/app/bsky/feed/threadgate.ts b/packages/pds/src/lexicon/types/app/bsky/feed/threadgate.ts
index c0e618c8f53..04a6205c8ad 100644
--- a/packages/pds/src/lexicon/types/app/bsky/feed/threadgate.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/feed/threadgate.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.feed.threadgate'
 
 export interface Record {
   /** Reference (AT-URI) to the post record. */
@@ -21,17 +23,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.threadgate#main' ||
-      v.$type === 'app.bsky.feed.threadgate')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.feed.threadgate', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 /** Allow replies from actors mentioned in your post. */
@@ -39,16 +38,17 @@ export interface MentionRule {
   [k: string]: unknown
 }
 
-export function isMentionRule(v: unknown): v is MentionRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#mentionRule'
-  )
+export function isMentionRule(v: unknown): v is MentionRule & {
+  $type: $Type<'app.bsky.feed.threadgate', 'mentionRule'>
+} {
+  return is$typed(v, id, 'mentionRule')
 }
 
-export function validateMentionRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#mentionRule', v)
+export function validateMentionRule(v: unknown) {
+  return lexicons.validate(
+    `${id}#mentionRule`,
+    v,
+  ) as ValidationResult<MentionRule>
 }
 
 /** Allow replies from actors you follow. */
@@ -56,16 +56,17 @@ export interface FollowingRule {
   [k: string]: unknown
 }
 
-export function isFollowingRule(v: unknown): v is FollowingRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#followingRule'
-  )
+export function isFollowingRule(v: unknown): v is FollowingRule & {
+  $type: $Type<'app.bsky.feed.threadgate', 'followingRule'>
+} {
+  return is$typed(v, id, 'followingRule')
 }
 
-export function validateFollowingRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#followingRule', v)
+export function validateFollowingRule(v: unknown) {
+  return lexicons.validate(
+    `${id}#followingRule`,
+    v,
+  ) as ValidationResult<FollowingRule>
 }
 
 /** Allow replies from actors on a list. */
@@ -74,14 +75,12 @@ export interface ListRule {
   [k: string]: unknown
 }
 
-export function isListRule(v: unknown): v is ListRule {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.threadgate#listRule'
-  )
+export function isListRule(
+  v: unknown,
+): v is ListRule & { $type: $Type<'app.bsky.feed.threadgate', 'listRule'> } {
+  return is$typed(v, id, 'listRule')
 }
 
-export function validateListRule(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.threadgate#listRule', v)
+export function validateListRule(v: unknown) {
+  return lexicons.validate(`${id}#listRule`, v) as ValidationResult<ListRule>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/block.ts b/packages/pds/src/lexicon/types/app/bsky/graph/block.ts
index b7f19f126b7..167afdf2f9b 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/block.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/block.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.graph.block'
 
 export interface Record {
   /** DID of the account to be blocked. */
@@ -13,15 +15,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.block#main' ||
-      v.$type === 'app.bsky.graph.block')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.graph.block', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.block#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/defs.ts b/packages/pds/src/lexicon/types/app/bsky/graph/defs.ts
index 63ecf7e00c0..08792d3103a 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/defs.ts
@@ -2,14 +2,16 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as AppBskyFeedDefs from '../feed/defs'
 
+const id = 'app.bsky.graph.defs'
+
 export interface ListViewBasic {
   uri: string
   cid: string
@@ -23,16 +25,17 @@ export interface ListViewBasic {
   [k: string]: unknown
 }
 
-export function isListViewBasic(v: unknown): v is ListViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listViewBasic'
-  )
+export function isListViewBasic(v: unknown): v is ListViewBasic & {
+  $type: $Type<'app.bsky.graph.defs', 'listViewBasic'>
+} {
+  return is$typed(v, id, 'listViewBasic')
 }
 
-export function validateListViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listViewBasic', v)
+export function validateListViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#listViewBasic`,
+    v,
+  ) as ValidationResult<ListViewBasic>
 }
 
 export interface ListView {
@@ -51,16 +54,14 @@ export interface ListView {
   [k: string]: unknown
 }
 
-export function isListView(v: unknown): v is ListView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listView'
-  )
+export function isListView(
+  v: unknown,
+): v is ListView & { $type: $Type<'app.bsky.graph.defs', 'listView'> } {
+  return is$typed(v, id, 'listView')
 }
 
-export function validateListView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listView', v)
+export function validateListView(v: unknown) {
+  return lexicons.validate(`${id}#listView`, v) as ValidationResult<ListView>
 }
 
 export interface ListItemView {
@@ -69,16 +70,17 @@ export interface ListItemView {
   [k: string]: unknown
 }
 
-export function isListItemView(v: unknown): v is ListItemView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listItemView'
-  )
+export function isListItemView(
+  v: unknown,
+): v is ListItemView & { $type: $Type<'app.bsky.graph.defs', 'listItemView'> } {
+  return is$typed(v, id, 'listItemView')
 }
 
-export function validateListItemView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listItemView', v)
+export function validateListItemView(v: unknown) {
+  return lexicons.validate(
+    `${id}#listItemView`,
+    v,
+  ) as ValidationResult<ListItemView>
 }
 
 export interface StarterPackView {
@@ -96,16 +98,17 @@ export interface StarterPackView {
   [k: string]: unknown
 }
 
-export function isStarterPackView(v: unknown): v is StarterPackView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#starterPackView'
-  )
+export function isStarterPackView(v: unknown): v is StarterPackView & {
+  $type: $Type<'app.bsky.graph.defs', 'starterPackView'>
+} {
+  return is$typed(v, id, 'starterPackView')
 }
 
-export function validateStarterPackView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#starterPackView', v)
+export function validateStarterPackView(v: unknown) {
+  return lexicons.validate(
+    `${id}#starterPackView`,
+    v,
+  ) as ValidationResult<StarterPackView>
 }
 
 export interface StarterPackViewBasic {
@@ -121,16 +124,19 @@ export interface StarterPackViewBasic {
   [k: string]: unknown
 }
 
-export function isStarterPackViewBasic(v: unknown): v is StarterPackViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#starterPackViewBasic'
-  )
+export function isStarterPackViewBasic(
+  v: unknown,
+): v is StarterPackViewBasic & {
+  $type: $Type<'app.bsky.graph.defs', 'starterPackViewBasic'>
+} {
+  return is$typed(v, id, 'starterPackViewBasic')
 }
 
-export function validateStarterPackViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#starterPackViewBasic', v)
+export function validateStarterPackViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#starterPackViewBasic`,
+    v,
+  ) as ValidationResult<StarterPackViewBasic>
 }
 
 export type ListPurpose =
@@ -140,11 +146,11 @@ export type ListPurpose =
   | (string & {})
 
 /** A list of actors to apply an aggregate moderation action (mute/block) on. */
-export const MODLIST = 'app.bsky.graph.defs#modlist'
+export const MODLIST = `${id}#modlist`
 /** A list of actors used for curation purposes such as list feeds or interaction gating. */
-export const CURATELIST = 'app.bsky.graph.defs#curatelist'
+export const CURATELIST = `${id}#curatelist`
 /** A list of actors used for only for reference purposes such as within a starter pack. */
-export const REFERENCELIST = 'app.bsky.graph.defs#referencelist'
+export const REFERENCELIST = `${id}#referencelist`
 
 export interface ListViewerState {
   muted?: boolean
@@ -152,16 +158,17 @@ export interface ListViewerState {
   [k: string]: unknown
 }
 
-export function isListViewerState(v: unknown): v is ListViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#listViewerState'
-  )
+export function isListViewerState(v: unknown): v is ListViewerState & {
+  $type: $Type<'app.bsky.graph.defs', 'listViewerState'>
+} {
+  return is$typed(v, id, 'listViewerState')
 }
 
-export function validateListViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#listViewerState', v)
+export function validateListViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#listViewerState`,
+    v,
+  ) as ValidationResult<ListViewerState>
 }
 
 /** indicates that a handle or DID could not be resolved */
@@ -171,16 +178,17 @@ export interface NotFoundActor {
   [k: string]: unknown
 }
 
-export function isNotFoundActor(v: unknown): v is NotFoundActor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#notFoundActor'
-  )
+export function isNotFoundActor(v: unknown): v is NotFoundActor & {
+  $type: $Type<'app.bsky.graph.defs', 'notFoundActor'>
+} {
+  return is$typed(v, id, 'notFoundActor')
 }
 
-export function validateNotFoundActor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#notFoundActor', v)
+export function validateNotFoundActor(v: unknown) {
+  return lexicons.validate(
+    `${id}#notFoundActor`,
+    v,
+  ) as ValidationResult<NotFoundActor>
 }
 
 /** lists the bi-directional graph relationships between one actor (not indicated in the object), and the target actors (the DID included in the object) */
@@ -193,14 +201,15 @@ export interface Relationship {
   [k: string]: unknown
 }
 
-export function isRelationship(v: unknown): v is Relationship {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.defs#relationship'
-  )
+export function isRelationship(
+  v: unknown,
+): v is Relationship & { $type: $Type<'app.bsky.graph.defs', 'relationship'> } {
+  return is$typed(v, id, 'relationship')
 }
 
-export function validateRelationship(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.defs#relationship', v)
+export function validateRelationship(v: unknown) {
+  return lexicons.validate(
+    `${id}#relationship`,
+    v,
+  ) as ValidationResult<Relationship>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/follow.ts b/packages/pds/src/lexicon/types/app/bsky/graph/follow.ts
index 4b74a58a5df..bb0f2d2dc3a 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/follow.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/follow.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.graph.follow'
 
 export interface Record {
   subject: string
@@ -12,15 +14,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.follow#main' ||
-      v.$type === 'app.bsky.graph.follow')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.graph.follow', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.follow#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
index 10250d0f3b4..ee9a8af4999 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getActorStarterPacks.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getActorStarterPacks'
+
 export interface QueryParams {
   actor: string
   limit: number
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getBlocks.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getBlocks.ts
index 1fc9cd8ce37..d353dc99267 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getBlocks.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getBlocks.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.graph.getBlocks'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getFollowers.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getFollowers.ts
index f5645eaef29..a44fe4c7ca9 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getFollowers.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getFollowers.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.graph.getFollowers'
+
 export interface QueryParams {
   actor: string
   limit: number
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getFollows.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getFollows.ts
index b9bd249da45..af3b8214783 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getFollows.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getFollows.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.graph.getFollows'
+
 export interface QueryParams {
   actor: string
   limit: number
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
index f5645eaef29..0cdb01d99df 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getKnownFollowers.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.graph.getKnownFollowers'
+
 export interface QueryParams {
   actor: string
   limit: number
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getList.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getList.ts
index 864a81b3833..444d463f7be 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getList.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getList.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getList'
+
 export interface QueryParams {
   /** Reference (AT-URI) of the list record to hydrate. */
   list: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getListBlocks.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getListBlocks.ts
index 7399a14fadc..2828969d77c 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getListBlocks.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getListBlocks.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getListBlocks'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getListMutes.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getListMutes.ts
index 7399a14fadc..25fc22a45e7 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getListMutes.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getListMutes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getListMutes'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getLists.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getLists.ts
index dc0c4f18bea..04c1e929899 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getLists.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getLists.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getLists'
+
 export interface QueryParams {
   /** The account (actor) to enumerate lists from. */
   actor: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getMutes.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getMutes.ts
index f450393522d..fcfbadd3154 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getMutes.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getMutes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.graph.getMutes'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getRelationships.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getRelationships.ts
index bd6b6e765ed..b169bc9de7e 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getRelationships.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getRelationships.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getRelationships'
+
 export interface QueryParams {
   /** Primary account requesting relationships for. */
   actor: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPack.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPack.ts
index 93fe21f0b13..906e412e1c5 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPack.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPack.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getStarterPack'
+
 export interface QueryParams {
   /** Reference (AT-URI) of the starter pack record. */
   starterPack: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPacks.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
index 4b9757b941e..829cfa6bc94 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getStarterPacks.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.getStarterPacks'
+
 export interface QueryParams {
   uris: string[]
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts b/packages/pds/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
index 99b97e708f5..7a59fd5716d 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/getSuggestedFollowsByActor.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 
+const id = 'app.bsky.graph.getSuggestedFollowsByActor'
+
 export interface QueryParams {
   actor: string
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/list.ts b/packages/pds/src/lexicon/types/app/bsky/graph/list.ts
index 91c8ccee5bb..4fc99ad59d4 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/list.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/list.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyGraphDefs from './defs'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const id = 'app.bsky.graph.list'
+
 export interface Record {
   purpose: AppBskyGraphDefs.ListPurpose
   /** Display name for list; can not be empty. */
@@ -23,15 +25,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.list#main' ||
-      v.$type === 'app.bsky.graph.list')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.graph.list', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.list#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/listblock.ts b/packages/pds/src/lexicon/types/app/bsky/graph/listblock.ts
index 592778c7a51..e159ed9b6d1 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/listblock.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/listblock.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.graph.listblock'
 
 export interface Record {
   /** Reference (AT-URI) to the mod list record. */
@@ -13,15 +15,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.listblock#main' ||
-      v.$type === 'app.bsky.graph.listblock')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.graph.listblock', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.listblock#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/listitem.ts b/packages/pds/src/lexicon/types/app/bsky/graph/listitem.ts
index 5e93b34a111..164196cfc25 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/listitem.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/listitem.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.graph.listitem'
 
 export interface Record {
   /** The account which is included on the list. */
@@ -15,15 +17,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.listitem#main' ||
-      v.$type === 'app.bsky.graph.listitem')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.graph.listitem', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.listitem#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/muteActor.ts b/packages/pds/src/lexicon/types/app/bsky/graph/muteActor.ts
index baa9844046a..aa9b7a1b950 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/muteActor.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/muteActor.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.graph.muteActor'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/muteActorList.ts b/packages/pds/src/lexicon/types/app/bsky/graph/muteActorList.ts
index 6a68f680a1c..0acc1da0dc2 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/muteActorList.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/muteActorList.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.graph.muteActorList'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/muteThread.ts b/packages/pds/src/lexicon/types/app/bsky/graph/muteThread.ts
index 928c56b6fc3..552bff9572f 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/muteThread.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/muteThread.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.graph.muteThread'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts b/packages/pds/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
index dea496aa50f..643bb579fe1 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/searchStarterPacks.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyGraphDefs from './defs'
 
+const id = 'app.bsky.graph.searchStarterPacks'
+
 export interface QueryParams {
   /** Search query string. Syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
   q: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/starterpack.ts b/packages/pds/src/lexicon/types/app/bsky/graph/starterpack.ts
index 0daf8daf688..d7cb5b48930 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/starterpack.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/starterpack.ts
@@ -2,11 +2,13 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 
+const id = 'app.bsky.graph.starterpack'
+
 export interface Record {
   /** Display name for starter pack; can not be empty. */
   name: string
@@ -19,17 +21,14 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.graph.starterpack#main' ||
-      v.$type === 'app.bsky.graph.starterpack')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.graph.starterpack', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.starterpack#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
 
 export interface FeedItem {
@@ -37,14 +36,12 @@ export interface FeedItem {
   [k: string]: unknown
 }
 
-export function isFeedItem(v: unknown): v is FeedItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.graph.starterpack#feedItem'
-  )
+export function isFeedItem(
+  v: unknown,
+): v is FeedItem & { $type: $Type<'app.bsky.graph.starterpack', 'feedItem'> } {
+  return is$typed(v, id, 'feedItem')
 }
 
-export function validateFeedItem(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.graph.starterpack#feedItem', v)
+export function validateFeedItem(v: unknown) {
+  return lexicons.validate(`${id}#feedItem`, v) as ValidationResult<FeedItem>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActor.ts b/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActor.ts
index baa9844046a..74e02903ed7 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActor.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActor.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.graph.unmuteActor'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActorList.ts b/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
index 6a68f680a1c..44fc69490f8 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/unmuteActorList.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.graph.unmuteActorList'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/app/bsky/graph/unmuteThread.ts b/packages/pds/src/lexicon/types/app/bsky/graph/unmuteThread.ts
index 928c56b6fc3..135db7e8e4f 100644
--- a/packages/pds/src/lexicon/types/app/bsky/graph/unmuteThread.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/graph/unmuteThread.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.graph.unmuteThread'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/app/bsky/labeler/defs.ts b/packages/pds/src/lexicon/types/app/bsky/labeler/defs.ts
index e12c7203c57..461e2b33cbd 100644
--- a/packages/pds/src/lexicon/types/app/bsky/labeler/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/labeler/defs.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const id = 'app.bsky.labeler.defs'
+
 export interface LabelerView {
   uri: string
   cid: string
@@ -19,16 +21,17 @@ export interface LabelerView {
   [k: string]: unknown
 }
 
-export function isLabelerView(v: unknown): v is LabelerView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerView'
-  )
+export function isLabelerView(
+  v: unknown,
+): v is LabelerView & { $type: $Type<'app.bsky.labeler.defs', 'labelerView'> } {
+  return is$typed(v, id, 'labelerView')
 }
 
-export function validateLabelerView(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerView', v)
+export function validateLabelerView(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerView`,
+    v,
+  ) as ValidationResult<LabelerView>
 }
 
 export interface LabelerViewDetailed {
@@ -43,16 +46,17 @@ export interface LabelerViewDetailed {
   [k: string]: unknown
 }
 
-export function isLabelerViewDetailed(v: unknown): v is LabelerViewDetailed {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerViewDetailed'
-  )
+export function isLabelerViewDetailed(v: unknown): v is LabelerViewDetailed & {
+  $type: $Type<'app.bsky.labeler.defs', 'labelerViewDetailed'>
+} {
+  return is$typed(v, id, 'labelerViewDetailed')
 }
 
-export function validateLabelerViewDetailed(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerViewDetailed', v)
+export function validateLabelerViewDetailed(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerViewDetailed`,
+    v,
+  ) as ValidationResult<LabelerViewDetailed>
 }
 
 export interface LabelerViewerState {
@@ -60,16 +64,17 @@ export interface LabelerViewerState {
   [k: string]: unknown
 }
 
-export function isLabelerViewerState(v: unknown): v is LabelerViewerState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerViewerState'
-  )
+export function isLabelerViewerState(v: unknown): v is LabelerViewerState & {
+  $type: $Type<'app.bsky.labeler.defs', 'labelerViewerState'>
+} {
+  return is$typed(v, id, 'labelerViewerState')
 }
 
-export function validateLabelerViewerState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerViewerState', v)
+export function validateLabelerViewerState(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerViewerState`,
+    v,
+  ) as ValidationResult<LabelerViewerState>
 }
 
 export interface LabelerPolicies {
@@ -80,14 +85,15 @@ export interface LabelerPolicies {
   [k: string]: unknown
 }
 
-export function isLabelerPolicies(v: unknown): v is LabelerPolicies {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.labeler.defs#labelerPolicies'
-  )
+export function isLabelerPolicies(v: unknown): v is LabelerPolicies & {
+  $type: $Type<'app.bsky.labeler.defs', 'labelerPolicies'>
+} {
+  return is$typed(v, id, 'labelerPolicies')
 }
 
-export function validateLabelerPolicies(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.defs#labelerPolicies', v)
+export function validateLabelerPolicies(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelerPolicies`,
+    v,
+  ) as ValidationResult<LabelerPolicies>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/labeler/getServices.ts b/packages/pds/src/lexicon/types/app/bsky/labeler/getServices.ts
index faeb30b4798..c80da11262f 100644
--- a/packages/pds/src/lexicon/types/app/bsky/labeler/getServices.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/labeler/getServices.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyLabelerDefs from './defs'
 
+const id = 'app.bsky.labeler.getServices'
+
 export interface QueryParams {
   dids: string[]
   detailed: boolean
diff --git a/packages/pds/src/lexicon/types/app/bsky/labeler/service.ts b/packages/pds/src/lexicon/types/app/bsky/labeler/service.ts
index a044b8699b6..0abc40dc8d1 100644
--- a/packages/pds/src/lexicon/types/app/bsky/labeler/service.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/labeler/service.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyLabelerDefs from './defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const id = 'app.bsky.labeler.service'
+
 export interface Record {
   policies: AppBskyLabelerDefs.LabelerPolicies
   labels?:
@@ -17,15 +19,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.labeler.service#main' ||
-      v.$type === 'app.bsky.labeler.service')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'app.bsky.labeler.service', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.labeler.service#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/notification/getUnreadCount.ts b/packages/pds/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
index 3931e24d3f0..d52044a760b 100644
--- a/packages/pds/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/notification/getUnreadCount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.notification.getUnreadCount'
+
 export interface QueryParams {
   priority?: boolean
   seenAt?: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/notification/listNotifications.ts b/packages/pds/src/lexicon/types/app/bsky/notification/listNotifications.ts
index 88fe90a0518..29af61a9449 100644
--- a/packages/pds/src/lexicon/types/app/bsky/notification/listNotifications.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/notification/listNotifications.ts
@@ -3,13 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const id = 'app.bsky.notification.listNotifications'
+
 export interface QueryParams {
   /** Notification reasons to include in response. */
   reasons?: string[]
@@ -76,17 +78,15 @@ export interface Notification {
   [k: string]: unknown
 }
 
-export function isNotification(v: unknown): v is Notification {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.notification.listNotifications#notification'
-  )
+export function isNotification(v: unknown): v is Notification & {
+  $type: $Type<'app.bsky.notification.listNotifications', 'notification'>
+} {
+  return is$typed(v, id, 'notification')
 }
 
-export function validateNotification(v: unknown): ValidationResult {
+export function validateNotification(v: unknown) {
   return lexicons.validate(
-    'app.bsky.notification.listNotifications#notification',
+    `${id}#notification`,
     v,
-  )
+  ) as ValidationResult<Notification>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/notification/putPreferences.ts b/packages/pds/src/lexicon/types/app/bsky/notification/putPreferences.ts
index 2c3a9d6fdbb..0b5a9f066ad 100644
--- a/packages/pds/src/lexicon/types/app/bsky/notification/putPreferences.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/notification/putPreferences.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.notification.putPreferences'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/app/bsky/notification/registerPush.ts b/packages/pds/src/lexicon/types/app/bsky/notification/registerPush.ts
index cce8f95839d..516babda578 100644
--- a/packages/pds/src/lexicon/types/app/bsky/notification/registerPush.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/notification/registerPush.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.notification.registerPush'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/app/bsky/notification/updateSeen.ts b/packages/pds/src/lexicon/types/app/bsky/notification/updateSeen.ts
index 93db017a152..6312ceeaa15 100644
--- a/packages/pds/src/lexicon/types/app/bsky/notification/updateSeen.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/notification/updateSeen.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.notification.updateSeen'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/app/bsky/richtext/facet.ts b/packages/pds/src/lexicon/types/app/bsky/richtext/facet.ts
index 139b5382caf..0a14274b608 100644
--- a/packages/pds/src/lexicon/types/app/bsky/richtext/facet.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/richtext/facet.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.richtext.facet'
 
 /** Annotation of a sub-string within rich text. */
 export interface Main {
@@ -13,17 +15,14 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.richtext.facet#main' ||
-      v.$type === 'app.bsky.richtext.facet')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: $Type<'app.bsky.richtext.facet', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
 
 /** Facet feature for mention of another account. The text is usually a handle, including a '@' prefix, but the facet reference is a DID. */
@@ -32,16 +31,14 @@ export interface Mention {
   [k: string]: unknown
 }
 
-export function isMention(v: unknown): v is Mention {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#mention'
-  )
+export function isMention(
+  v: unknown,
+): v is Mention & { $type: $Type<'app.bsky.richtext.facet', 'mention'> } {
+  return is$typed(v, id, 'mention')
 }
 
-export function validateMention(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#mention', v)
+export function validateMention(v: unknown) {
+  return lexicons.validate(`${id}#mention`, v) as ValidationResult<Mention>
 }
 
 /** Facet feature for a URL. The text URL may have been simplified or truncated, but the facet reference should be a complete URL. */
@@ -50,16 +47,14 @@ export interface Link {
   [k: string]: unknown
 }
 
-export function isLink(v: unknown): v is Link {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#link'
-  )
+export function isLink(
+  v: unknown,
+): v is Link & { $type: $Type<'app.bsky.richtext.facet', 'link'> } {
+  return is$typed(v, id, 'link')
 }
 
-export function validateLink(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#link', v)
+export function validateLink(v: unknown) {
+  return lexicons.validate(`${id}#link`, v) as ValidationResult<Link>
 }
 
 /** Facet feature for a hashtag. The text usually includes a '#' prefix, but the facet reference should not (except in the case of 'double hash tags'). */
@@ -68,14 +63,14 @@ export interface Tag {
   [k: string]: unknown
 }
 
-export function isTag(v: unknown): v is Tag {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.richtext.facet#tag'
-  )
+export function isTag(
+  v: unknown,
+): v is Tag & { $type: $Type<'app.bsky.richtext.facet', 'tag'> } {
+  return is$typed(v, id, 'tag')
 }
 
-export function validateTag(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#tag', v)
+export function validateTag(v: unknown) {
+  return lexicons.validate(`${id}#tag`, v) as ValidationResult<Tag>
 }
 
 /** Specifies the sub-string range a facet feature applies to. Start index is inclusive, end index is exclusive. Indices are zero-indexed, counting bytes of the UTF-8 encoded text. NOTE: some languages, like Javascript, use UTF-16 or Unicode codepoints for string slice indexing; in these languages, convert to byte arrays before working with facets. */
@@ -85,14 +80,12 @@ export interface ByteSlice {
   [k: string]: unknown
 }
 
-export function isByteSlice(v: unknown): v is ByteSlice {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.richtext.facet#byteSlice'
-  )
+export function isByteSlice(
+  v: unknown,
+): v is ByteSlice & { $type: $Type<'app.bsky.richtext.facet', 'byteSlice'> } {
+  return is$typed(v, id, 'byteSlice')
 }
 
-export function validateByteSlice(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.richtext.facet#byteSlice', v)
+export function validateByteSlice(v: unknown) {
+  return lexicons.validate(`${id}#byteSlice`, v) as ValidationResult<ByteSlice>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/defs.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/defs.ts
index f25e35853c5..a8432782ce5 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/defs.ts
@@ -2,25 +2,28 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.unspecced.defs'
 
 export interface SkeletonSearchPost {
   uri: string
   [k: string]: unknown
 }
 
-export function isSkeletonSearchPost(v: unknown): v is SkeletonSearchPost {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchPost'
-  )
+export function isSkeletonSearchPost(v: unknown): v is SkeletonSearchPost & {
+  $type: $Type<'app.bsky.unspecced.defs', 'skeletonSearchPost'>
+} {
+  return is$typed(v, id, 'skeletonSearchPost')
 }
 
-export function validateSkeletonSearchPost(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#skeletonSearchPost', v)
+export function validateSkeletonSearchPost(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonSearchPost`,
+    v,
+  ) as ValidationResult<SkeletonSearchPost>
 }
 
 export interface SkeletonSearchActor {
@@ -28,16 +31,17 @@ export interface SkeletonSearchActor {
   [k: string]: unknown
 }
 
-export function isSkeletonSearchActor(v: unknown): v is SkeletonSearchActor {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchActor'
-  )
+export function isSkeletonSearchActor(v: unknown): v is SkeletonSearchActor & {
+  $type: $Type<'app.bsky.unspecced.defs', 'skeletonSearchActor'>
+} {
+  return is$typed(v, id, 'skeletonSearchActor')
 }
 
-export function validateSkeletonSearchActor(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#skeletonSearchActor', v)
+export function validateSkeletonSearchActor(v: unknown) {
+  return lexicons.validate(
+    `${id}#skeletonSearchActor`,
+    v,
+  ) as ValidationResult<SkeletonSearchActor>
 }
 
 export interface SkeletonSearchStarterPack {
@@ -47,21 +51,17 @@ export interface SkeletonSearchStarterPack {
 
 export function isSkeletonSearchStarterPack(
   v: unknown,
-): v is SkeletonSearchStarterPack {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#skeletonSearchStarterPack'
-  )
+): v is SkeletonSearchStarterPack & {
+  $type: $Type<'app.bsky.unspecced.defs', 'skeletonSearchStarterPack'>
+} {
+  return is$typed(v, id, 'skeletonSearchStarterPack')
 }
 
-export function validateSkeletonSearchStarterPack(
-  v: unknown,
-): ValidationResult {
+export function validateSkeletonSearchStarterPack(v: unknown) {
   return lexicons.validate(
-    'app.bsky.unspecced.defs#skeletonSearchStarterPack',
+    `${id}#skeletonSearchStarterPack`,
     v,
-  )
+  ) as ValidationResult<SkeletonSearchStarterPack>
 }
 
 export interface TrendingTopic {
@@ -72,14 +72,15 @@ export interface TrendingTopic {
   [k: string]: unknown
 }
 
-export function isTrendingTopic(v: unknown): v is TrendingTopic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.defs#trendingTopic'
-  )
+export function isTrendingTopic(v: unknown): v is TrendingTopic & {
+  $type: $Type<'app.bsky.unspecced.defs', 'trendingTopic'>
+} {
+  return is$typed(v, id, 'trendingTopic')
 }
 
-export function validateTrendingTopic(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.unspecced.defs#trendingTopic', v)
+export function validateTrendingTopic(v: unknown) {
+  return lexicons.validate(
+    `${id}#trendingTopic`,
+    v,
+  ) as ValidationResult<TrendingTopic>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/getConfig.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/getConfig.ts
index da202ab0d54..b9e45fd96ce 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/getConfig.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/getConfig.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.unspecced.getConfig'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
index 02f19f3cc6a..20a45bc5992 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/getPopularFeedGenerators.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyFeedDefs from '../feed/defs'
 
+const id = 'app.bsky.unspecced.getPopularFeedGenerators'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
index b801fa34d72..579973036a5 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/getSuggestionsSkeleton.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyUnspeccedDefs from './defs'
 
+const id = 'app.bsky.unspecced.getSuggestionsSkeleton'
+
 export interface QueryParams {
   /** DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking. */
   viewer?: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
index a03f442140d..25e2c3b0ea3 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/getTaggedSuggestions.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.unspecced.getTaggedSuggestions'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -49,17 +51,15 @@ export interface Suggestion {
   [k: string]: unknown
 }
 
-export function isSuggestion(v: unknown): v is Suggestion {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.unspecced.getTaggedSuggestions#suggestion'
-  )
+export function isSuggestion(v: unknown): v is Suggestion & {
+  $type: $Type<'app.bsky.unspecced.getTaggedSuggestions', 'suggestion'>
+} {
+  return is$typed(v, id, 'suggestion')
 }
 
-export function validateSuggestion(v: unknown): ValidationResult {
+export function validateSuggestion(v: unknown) {
   return lexicons.validate(
-    'app.bsky.unspecced.getTaggedSuggestions#suggestion',
+    `${id}#suggestion`,
     v,
-  )
+  ) as ValidationResult<Suggestion>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
index 51b78652a74..47a4ac1a5b0 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/getTrendingTopics.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyUnspeccedDefs from './defs'
 
+const id = 'app.bsky.unspecced.getTrendingTopics'
+
 export interface QueryParams {
   /** DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking. */
   viewer?: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
index 94295f45349..b4206a089b9 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyUnspeccedDefs from './defs'
 
+const id = 'app.bsky.unspecced.searchActorsSkeleton'
+
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. For typeahead search, only simple term match is supported, not full syntax. */
   q: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
index cd293454902..16b2ff87428 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyUnspeccedDefs from './defs'
 
+const id = 'app.bsky.unspecced.searchPostsSkeleton'
+
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
   q: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts b/packages/pds/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
index e980d884fec..6927713a2e4 100644
--- a/packages/pds/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/unspecced/searchStarterPacksSkeleton.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyUnspeccedDefs from './defs'
 
+const id = 'app.bsky.unspecced.searchStarterPacksSkeleton'
+
 export interface QueryParams {
   /** Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended. */
   q: string
diff --git a/packages/pds/src/lexicon/types/app/bsky/video/defs.ts b/packages/pds/src/lexicon/types/app/bsky/video/defs.ts
index 12f4d674794..7b82931c46c 100644
--- a/packages/pds/src/lexicon/types/app/bsky/video/defs.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/video/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'app.bsky.video.defs'
 
 export interface JobStatus {
   jobId: string
@@ -19,14 +21,12 @@ export interface JobStatus {
   [k: string]: unknown
 }
 
-export function isJobStatus(v: unknown): v is JobStatus {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.video.defs#jobStatus'
-  )
+export function isJobStatus(
+  v: unknown,
+): v is JobStatus & { $type: $Type<'app.bsky.video.defs', 'jobStatus'> } {
+  return is$typed(v, id, 'jobStatus')
 }
 
-export function validateJobStatus(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.video.defs#jobStatus', v)
+export function validateJobStatus(v: unknown) {
+  return lexicons.validate(`${id}#jobStatus`, v) as ValidationResult<JobStatus>
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/video/getJobStatus.ts b/packages/pds/src/lexicon/types/app/bsky/video/getJobStatus.ts
index 3e075ba2195..6cea4453ace 100644
--- a/packages/pds/src/lexicon/types/app/bsky/video/getJobStatus.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/video/getJobStatus.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyVideoDefs from './defs'
 
+const id = 'app.bsky.video.getJobStatus'
+
 export interface QueryParams {
   jobId: string
 }
diff --git a/packages/pds/src/lexicon/types/app/bsky/video/getUploadLimits.ts b/packages/pds/src/lexicon/types/app/bsky/video/getUploadLimits.ts
index f0f23003b0b..e1a2c8a12f8 100644
--- a/packages/pds/src/lexicon/types/app/bsky/video/getUploadLimits.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/video/getUploadLimits.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'app.bsky.video.getUploadLimits'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/pds/src/lexicon/types/app/bsky/video/uploadVideo.ts b/packages/pds/src/lexicon/types/app/bsky/video/uploadVideo.ts
index c23ff677a4b..85e0beeb811 100644
--- a/packages/pds/src/lexicon/types/app/bsky/video/uploadVideo.ts
+++ b/packages/pds/src/lexicon/types/app/bsky/video/uploadVideo.ts
@@ -4,12 +4,14 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as AppBskyVideoDefs from './defs'
 
+const id = 'app.bsky.video.uploadVideo'
+
 export interface QueryParams {}
 
 export type InputSchema = string | Uint8Array | Blob
diff --git a/packages/pds/src/lexicon/types/chat/bsky/actor/declaration.ts b/packages/pds/src/lexicon/types/chat/bsky/actor/declaration.ts
index b837351c1e1..454bd9edf6f 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/actor/declaration.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/actor/declaration.ts
@@ -2,24 +2,23 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'chat.bsky.actor.declaration'
 
 export interface Record {
   allowIncoming: 'all' | 'none' | 'following' | (string & {})
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'chat.bsky.actor.declaration#main' ||
-      v.$type === 'chat.bsky.actor.declaration')
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'chat.bsky.actor.declaration', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.actor.declaration#main', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Record>
 }
diff --git a/packages/pds/src/lexicon/types/chat/bsky/actor/defs.ts b/packages/pds/src/lexicon/types/chat/bsky/actor/defs.ts
index 8a05d480784..858aaa5a69e 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/actor/defs.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/actor/defs.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const id = 'chat.bsky.actor.defs'
+
 export interface ProfileViewBasic {
   did: string
   handle: string
@@ -21,14 +23,15 @@ export interface ProfileViewBasic {
   [k: string]: unknown
 }
 
-export function isProfileViewBasic(v: unknown): v is ProfileViewBasic {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.actor.defs#profileViewBasic'
-  )
+export function isProfileViewBasic(v: unknown): v is ProfileViewBasic & {
+  $type: $Type<'chat.bsky.actor.defs', 'profileViewBasic'>
+} {
+  return is$typed(v, id, 'profileViewBasic')
 }
 
-export function validateProfileViewBasic(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.actor.defs#profileViewBasic', v)
+export function validateProfileViewBasic(v: unknown) {
+  return lexicons.validate(
+    `${id}#profileViewBasic`,
+    v,
+  ) as ValidationResult<ProfileViewBasic>
 }
diff --git a/packages/pds/src/lexicon/types/chat/bsky/actor/deleteAccount.ts b/packages/pds/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
index 08714990fcb..c45ee77d22e 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/actor/deleteAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'chat.bsky.actor.deleteAccount'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/pds/src/lexicon/types/chat/bsky/actor/exportAccountData.ts b/packages/pds/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
index f6f38ab2fb3..aa37fb7e366 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/actor/exportAccountData.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'chat.bsky.actor.exportAccountData'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/defs.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/defs.ts
index b2452410be2..d802616974a 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/defs.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/defs.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyRichtextFacet from '../../../app/bsky/richtext/facet'
 import * as AppBskyEmbedRecord from '../../../app/bsky/embed/record'
 import * as ChatBskyActorDefs from '../actor/defs'
 
+const id = 'chat.bsky.convo.defs'
+
 export interface MessageRef {
   did: string
   convoId: string
@@ -16,16 +18,17 @@ export interface MessageRef {
   [k: string]: unknown
 }
 
-export function isMessageRef(v: unknown): v is MessageRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageRef'
-  )
+export function isMessageRef(
+  v: unknown,
+): v is MessageRef & { $type: $Type<'chat.bsky.convo.defs', 'messageRef'> } {
+  return is$typed(v, id, 'messageRef')
 }
 
-export function validateMessageRef(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageRef', v)
+export function validateMessageRef(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageRef`,
+    v,
+  ) as ValidationResult<MessageRef>
 }
 
 export interface MessageInput {
@@ -36,16 +39,17 @@ export interface MessageInput {
   [k: string]: unknown
 }
 
-export function isMessageInput(v: unknown): v is MessageInput {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageInput'
-  )
+export function isMessageInput(v: unknown): v is MessageInput & {
+  $type: $Type<'chat.bsky.convo.defs', 'messageInput'>
+} {
+  return is$typed(v, id, 'messageInput')
 }
 
-export function validateMessageInput(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageInput', v)
+export function validateMessageInput(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageInput`,
+    v,
+  ) as ValidationResult<MessageInput>
 }
 
 export interface MessageView {
@@ -60,16 +64,17 @@ export interface MessageView {
   [k: string]: unknown
 }
 
-export function isMessageView(v: unknown): v is MessageView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageView'
-  )
+export function isMessageView(
+  v: unknown,
+): v is MessageView & { $type: $Type<'chat.bsky.convo.defs', 'messageView'> } {
+  return is$typed(v, id, 'messageView')
 }
 
-export function validateMessageView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageView', v)
+export function validateMessageView(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageView`,
+    v,
+  ) as ValidationResult<MessageView>
 }
 
 export interface DeletedMessageView {
@@ -80,16 +85,17 @@ export interface DeletedMessageView {
   [k: string]: unknown
 }
 
-export function isDeletedMessageView(v: unknown): v is DeletedMessageView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#deletedMessageView'
-  )
+export function isDeletedMessageView(v: unknown): v is DeletedMessageView & {
+  $type: $Type<'chat.bsky.convo.defs', 'deletedMessageView'>
+} {
+  return is$typed(v, id, 'deletedMessageView')
 }
 
-export function validateDeletedMessageView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#deletedMessageView', v)
+export function validateDeletedMessageView(v: unknown) {
+  return lexicons.validate(
+    `${id}#deletedMessageView`,
+    v,
+  ) as ValidationResult<DeletedMessageView>
 }
 
 export interface MessageViewSender {
@@ -97,16 +103,17 @@ export interface MessageViewSender {
   [k: string]: unknown
 }
 
-export function isMessageViewSender(v: unknown): v is MessageViewSender {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#messageViewSender'
-  )
+export function isMessageViewSender(v: unknown): v is MessageViewSender & {
+  $type: $Type<'chat.bsky.convo.defs', 'messageViewSender'>
+} {
+  return is$typed(v, id, 'messageViewSender')
 }
 
-export function validateMessageViewSender(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#messageViewSender', v)
+export function validateMessageViewSender(v: unknown) {
+  return lexicons.validate(
+    `${id}#messageViewSender`,
+    v,
+  ) as ValidationResult<MessageViewSender>
 }
 
 export interface ConvoView {
@@ -123,16 +130,14 @@ export interface ConvoView {
   [k: string]: unknown
 }
 
-export function isConvoView(v: unknown): v is ConvoView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#convoView'
-  )
+export function isConvoView(
+  v: unknown,
+): v is ConvoView & { $type: $Type<'chat.bsky.convo.defs', 'convoView'> } {
+  return is$typed(v, id, 'convoView')
 }
 
-export function validateConvoView(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#convoView', v)
+export function validateConvoView(v: unknown) {
+  return lexicons.validate(`${id}#convoView`, v) as ValidationResult<ConvoView>
 }
 
 export interface LogBeginConvo {
@@ -141,16 +146,17 @@ export interface LogBeginConvo {
   [k: string]: unknown
 }
 
-export function isLogBeginConvo(v: unknown): v is LogBeginConvo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logBeginConvo'
-  )
+export function isLogBeginConvo(v: unknown): v is LogBeginConvo & {
+  $type: $Type<'chat.bsky.convo.defs', 'logBeginConvo'>
+} {
+  return is$typed(v, id, 'logBeginConvo')
 }
 
-export function validateLogBeginConvo(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logBeginConvo', v)
+export function validateLogBeginConvo(v: unknown) {
+  return lexicons.validate(
+    `${id}#logBeginConvo`,
+    v,
+  ) as ValidationResult<LogBeginConvo>
 }
 
 export interface LogLeaveConvo {
@@ -159,16 +165,17 @@ export interface LogLeaveConvo {
   [k: string]: unknown
 }
 
-export function isLogLeaveConvo(v: unknown): v is LogLeaveConvo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logLeaveConvo'
-  )
+export function isLogLeaveConvo(v: unknown): v is LogLeaveConvo & {
+  $type: $Type<'chat.bsky.convo.defs', 'logLeaveConvo'>
+} {
+  return is$typed(v, id, 'logLeaveConvo')
 }
 
-export function validateLogLeaveConvo(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logLeaveConvo', v)
+export function validateLogLeaveConvo(v: unknown) {
+  return lexicons.validate(
+    `${id}#logLeaveConvo`,
+    v,
+  ) as ValidationResult<LogLeaveConvo>
 }
 
 export interface LogCreateMessage {
@@ -181,16 +188,17 @@ export interface LogCreateMessage {
   [k: string]: unknown
 }
 
-export function isLogCreateMessage(v: unknown): v is LogCreateMessage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logCreateMessage'
-  )
+export function isLogCreateMessage(v: unknown): v is LogCreateMessage & {
+  $type: $Type<'chat.bsky.convo.defs', 'logCreateMessage'>
+} {
+  return is$typed(v, id, 'logCreateMessage')
 }
 
-export function validateLogCreateMessage(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logCreateMessage', v)
+export function validateLogCreateMessage(v: unknown) {
+  return lexicons.validate(
+    `${id}#logCreateMessage`,
+    v,
+  ) as ValidationResult<LogCreateMessage>
 }
 
 export interface LogDeleteMessage {
@@ -203,14 +211,15 @@ export interface LogDeleteMessage {
   [k: string]: unknown
 }
 
-export function isLogDeleteMessage(v: unknown): v is LogDeleteMessage {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#logDeleteMessage'
-  )
+export function isLogDeleteMessage(v: unknown): v is LogDeleteMessage & {
+  $type: $Type<'chat.bsky.convo.defs', 'logDeleteMessage'>
+} {
+  return is$typed(v, id, 'logDeleteMessage')
 }
 
-export function validateLogDeleteMessage(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#logDeleteMessage', v)
+export function validateLogDeleteMessage(v: unknown) {
+  return lexicons.validate(
+    `${id}#logDeleteMessage`,
+    v,
+  ) as ValidationResult<LogDeleteMessage>
 }
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
index c05bc99b36a..4364c075ecd 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/deleteMessageForSelf.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.deleteMessageForSelf'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/getConvo.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/getConvo.ts
index 1448c75b306..7563c777197 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/getConvo.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/getConvo.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.getConvo'
+
 export interface QueryParams {
   convoId: string
 }
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
index 108dfd6ad5b..d7a1a69bb13 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/getConvoForMembers.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.getConvoForMembers'
+
 export interface QueryParams {
   members: string[]
 }
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/getLog.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/getLog.ts
index 89f6778c4d3..47f28623631 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/getLog.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/getLog.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.getLog'
+
 export interface QueryParams {
   cursor?: string
 }
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/getMessages.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/getMessages.ts
index a615ba37674..68f9331fdef 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/getMessages.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/getMessages.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.getMessages'
+
 export interface QueryParams {
   convoId: string
   limit: number
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/leaveConvo.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
index 8b76a7b0c75..67a3e3a141c 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/leaveConvo.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'chat.bsky.convo.leaveConvo'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/listConvos.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/listConvos.ts
index 4d6f35bf39c..5829bd5b899 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/listConvos.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/listConvos.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.listConvos'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/muteConvo.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/muteConvo.ts
index ddb57623913..c12e1df0238 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/muteConvo.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/muteConvo.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.muteConvo'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessage.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessage.ts
index ab2d8b03f89..6ac463db74c 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessage.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessage.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.sendMessage'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
index b3c2c2bc252..bc5291bbcf3 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.sendMessageBatch'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -55,14 +57,12 @@ export interface BatchItem {
   [k: string]: unknown
 }
 
-export function isBatchItem(v: unknown): v is BatchItem {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.sendMessageBatch#batchItem'
-  )
+export function isBatchItem(v: unknown): v is BatchItem & {
+  $type: $Type<'chat.bsky.convo.sendMessageBatch', 'batchItem'>
+} {
+  return is$typed(v, id, 'batchItem')
 }
 
-export function validateBatchItem(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.sendMessageBatch#batchItem', v)
+export function validateBatchItem(v: unknown) {
+  return lexicons.validate(`${id}#batchItem`, v) as ValidationResult<BatchItem>
 }
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
index ddb57623913..03188d2bbd2 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.unmuteConvo'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/chat/bsky/convo/updateRead.ts b/packages/pds/src/lexicon/types/chat/bsky/convo/updateRead.ts
index b879cde82b0..8b7440714c0 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/convo/updateRead.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/convo/updateRead.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from './defs'
 
+const id = 'chat.bsky.convo.updateRead'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts b/packages/pds/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
index 077a0076bab..2fd8e512d18 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'chat.bsky.moderation.getActorMetadata'
+
 export interface QueryParams {
   actor: string
 }
@@ -54,14 +56,12 @@ export interface Metadata {
   [k: string]: unknown
 }
 
-export function isMetadata(v: unknown): v is Metadata {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.moderation.getActorMetadata#metadata'
-  )
+export function isMetadata(v: unknown): v is Metadata & {
+  $type: $Type<'chat.bsky.moderation.getActorMetadata', 'metadata'>
+} {
+  return is$typed(v, id, 'metadata')
 }
 
-export function validateMetadata(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.moderation.getActorMetadata#metadata', v)
+export function validateMetadata(v: unknown) {
+  return lexicons.validate(`${id}#metadata`, v) as ValidationResult<Metadata>
 }
diff --git a/packages/pds/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts b/packages/pds/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
index 0a1f5b1b691..a24045586b0 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from '../convo/defs'
 
+const id = 'chat.bsky.moderation.getMessageContext'
+
 export interface QueryParams {
   /** Conversation that the message is from. NOTE: this field will eventually be required. */
   convoId?: string
diff --git a/packages/pds/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts b/packages/pds/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
index d9c95f69643..2493a8063be 100644
--- a/packages/pds/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
+++ b/packages/pds/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'chat.bsky.moderation.updateActorAccess'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/defs.ts b/packages/pds/src/lexicon/types/com/atproto/admin/defs.ts
index f58b7c7ece4..8b0e016c078 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/defs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/defs.ts
@@ -2,27 +2,30 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as ComAtprotoServerDefs from '../server/defs'
 
+const id = 'com.atproto.admin.defs'
+
 export interface StatusAttr {
   applied: boolean
   ref?: string
   [k: string]: unknown
 }
 
-export function isStatusAttr(v: unknown): v is StatusAttr {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#statusAttr'
-  )
+export function isStatusAttr(
+  v: unknown,
+): v is StatusAttr & { $type: $Type<'com.atproto.admin.defs', 'statusAttr'> } {
+  return is$typed(v, id, 'statusAttr')
 }
 
-export function validateStatusAttr(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#statusAttr', v)
+export function validateStatusAttr(v: unknown) {
+  return lexicons.validate(
+    `${id}#statusAttr`,
+    v,
+  ) as ValidationResult<StatusAttr>
 }
 
 export interface AccountView {
@@ -41,16 +44,17 @@ export interface AccountView {
   [k: string]: unknown
 }
 
-export function isAccountView(v: unknown): v is AccountView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#accountView'
-  )
+export function isAccountView(v: unknown): v is AccountView & {
+  $type: $Type<'com.atproto.admin.defs', 'accountView'>
+} {
+  return is$typed(v, id, 'accountView')
 }
 
-export function validateAccountView(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#accountView', v)
+export function validateAccountView(v: unknown) {
+  return lexicons.validate(
+    `${id}#accountView`,
+    v,
+  ) as ValidationResult<AccountView>
 }
 
 export interface RepoRef {
@@ -58,16 +62,14 @@ export interface RepoRef {
   [k: string]: unknown
 }
 
-export function isRepoRef(v: unknown): v is RepoRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#repoRef'
-  )
+export function isRepoRef(
+  v: unknown,
+): v is RepoRef & { $type: $Type<'com.atproto.admin.defs', 'repoRef'> } {
+  return is$typed(v, id, 'repoRef')
 }
 
-export function validateRepoRef(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#repoRef', v)
+export function validateRepoRef(v: unknown) {
+  return lexicons.validate(`${id}#repoRef`, v) as ValidationResult<RepoRef>
 }
 
 export interface RepoBlobRef {
@@ -77,16 +79,17 @@ export interface RepoBlobRef {
   [k: string]: unknown
 }
 
-export function isRepoBlobRef(v: unknown): v is RepoBlobRef {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#repoBlobRef'
-  )
+export function isRepoBlobRef(v: unknown): v is RepoBlobRef & {
+  $type: $Type<'com.atproto.admin.defs', 'repoBlobRef'>
+} {
+  return is$typed(v, id, 'repoBlobRef')
 }
 
-export function validateRepoBlobRef(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#repoBlobRef', v)
+export function validateRepoBlobRef(v: unknown) {
+  return lexicons.validate(
+    `${id}#repoBlobRef`,
+    v,
+  ) as ValidationResult<RepoBlobRef>
 }
 
 export interface ThreatSignature {
@@ -95,14 +98,15 @@ export interface ThreatSignature {
   [k: string]: unknown
 }
 
-export function isThreatSignature(v: unknown): v is ThreatSignature {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#threatSignature'
-  )
+export function isThreatSignature(v: unknown): v is ThreatSignature & {
+  $type: $Type<'com.atproto.admin.defs', 'threatSignature'>
+} {
+  return is$typed(v, id, 'threatSignature')
 }
 
-export function validateThreatSignature(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#threatSignature', v)
+export function validateThreatSignature(v: unknown) {
+  return lexicons.validate(
+    `${id}#threatSignature`,
+    v,
+  ) as ValidationResult<ThreatSignature>
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/deleteAccount.ts b/packages/pds/src/lexicon/types/com/atproto/admin/deleteAccount.ts
index 003c1b5ebcd..1acca2e1dab 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/deleteAccount.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/deleteAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.admin.deleteAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts b/packages/pds/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
index 68c6503d95e..d36f19ceb36 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/disableAccountInvites.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.admin.disableAccountInvites'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts b/packages/pds/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
index 2bf8de35583..9a9db8e9659 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/disableInviteCodes.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.admin.disableInviteCodes'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts b/packages/pds/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
index 3f2836e7142..a9e226a8e5d 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/enableAccountInvites.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.admin.enableAccountInvites'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfo.ts b/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
index c7b840a153d..0cf60326ea3 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfo.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 
+const id = 'com.atproto.admin.getAccountInfo'
+
 export interface QueryParams {
   did: string
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfos.ts b/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
index 99ef44a99f5..fb5c83de25a 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/getAccountInfos.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 
+const id = 'com.atproto.admin.getAccountInfos'
+
 export interface QueryParams {
   dids: string[]
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/getInviteCodes.ts b/packages/pds/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
index d68b97d775a..80d9487ee8b 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/getInviteCodes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoServerDefs from '../server/defs'
 
+const id = 'com.atproto.admin.getInviteCodes'
+
 export interface QueryParams {
   sort: 'recent' | 'usage' | (string & {})
   limit: number
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts b/packages/pds/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
index c13496638c8..21448f88d6b 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/getSubjectStatus.ts
@@ -3,13 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+const id = 'com.atproto.admin.getSubjectStatus'
+
 export interface QueryParams {
   did?: string
   uri?: string
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/searchAccounts.ts b/packages/pds/src/lexicon/types/com/atproto/admin/searchAccounts.ts
index 80d0eecd926..6a554d7c424 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/searchAccounts.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/searchAccounts.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 
+const id = 'com.atproto.admin.searchAccounts'
+
 export interface QueryParams {
   email?: string
   cursor?: string
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/sendEmail.ts b/packages/pds/src/lexicon/types/com/atproto/admin/sendEmail.ts
index 836fba39f79..baad3c1ee1f 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/sendEmail.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/sendEmail.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.admin.sendEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts b/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
index ebabffbccdb..e3aed0b58c9 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountEmail.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.admin.updateAccountEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts b/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
index d6dc4a2dc25..67c54a3b9de 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountHandle.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.admin.updateAccountHandle'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts b/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
index 948568f0d3d..c05879469c4 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/updateAccountPassword.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.admin.updateAccountPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts b/packages/pds/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
index c03d9667cae..e6630229fc0 100644
--- a/packages/pds/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/admin/updateSubjectStatus.ts
@@ -3,13 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+const id = 'com.atproto.admin.updateSubjectStatus'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts b/packages/pds/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
index 5fa374de737..56ae83a87d4 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/getRecommendedDidCredentials.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.identity.getRecommendedDidCredentials'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts b/packages/pds/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
index 82672f1d1c7..b687f9d01bc 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/requestPlcOperationSignature.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.identity.requestPlcOperationSignature'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/resolveHandle.ts b/packages/pds/src/lexicon/types/com/atproto/identity/resolveHandle.ts
index 05019df6166..c9e880b7cee 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/resolveHandle.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/resolveHandle.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.identity.resolveHandle'
+
 export interface QueryParams {
   /** The handle to resolve. */
   handle: string
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/signPlcOperation.ts b/packages/pds/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
index 3c908c049f2..c648e5b7ddf 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/signPlcOperation.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.identity.signPlcOperation'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts b/packages/pds/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
index 5290b55d023..3af1814148c 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/submitPlcOperation.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.identity.submitPlcOperation'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/identity/updateHandle.ts b/packages/pds/src/lexicon/types/com/atproto/identity/updateHandle.ts
index f451d1f57c7..c54d951e25d 100644
--- a/packages/pds/src/lexicon/types/com/atproto/identity/updateHandle.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/identity/updateHandle.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.identity.updateHandle'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/label/defs.ts b/packages/pds/src/lexicon/types/com/atproto/label/defs.ts
index 348e985622b..8b0bc71b198 100644
--- a/packages/pds/src/lexicon/types/com/atproto/label/defs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/label/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'com.atproto.label.defs'
 
 /** Metadata tag on an atproto resource (eg, repo or record). */
 export interface Label {
@@ -29,16 +31,14 @@ export interface Label {
   [k: string]: unknown
 }
 
-export function isLabel(v: unknown): v is Label {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#label'
-  )
+export function isLabel(
+  v: unknown,
+): v is Label & { $type: $Type<'com.atproto.label.defs', 'label'> } {
+  return is$typed(v, id, 'label')
 }
 
-export function validateLabel(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#label', v)
+export function validateLabel(v: unknown) {
+  return lexicons.validate(`${id}#label`, v) as ValidationResult<Label>
 }
 
 /** Metadata tags on an atproto record, published by the author within the record. */
@@ -47,16 +47,17 @@ export interface SelfLabels {
   [k: string]: unknown
 }
 
-export function isSelfLabels(v: unknown): v is SelfLabels {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#selfLabels'
-  )
+export function isSelfLabels(
+  v: unknown,
+): v is SelfLabels & { $type: $Type<'com.atproto.label.defs', 'selfLabels'> } {
+  return is$typed(v, id, 'selfLabels')
 }
 
-export function validateSelfLabels(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#selfLabels', v)
+export function validateSelfLabels(v: unknown) {
+  return lexicons.validate(
+    `${id}#selfLabels`,
+    v,
+  ) as ValidationResult<SelfLabels>
 }
 
 /** Metadata tag on an atproto record, published by the author within the record. Note that schemas should use #selfLabels, not #selfLabel. */
@@ -66,16 +67,14 @@ export interface SelfLabel {
   [k: string]: unknown
 }
 
-export function isSelfLabel(v: unknown): v is SelfLabel {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#selfLabel'
-  )
+export function isSelfLabel(
+  v: unknown,
+): v is SelfLabel & { $type: $Type<'com.atproto.label.defs', 'selfLabel'> } {
+  return is$typed(v, id, 'selfLabel')
 }
 
-export function validateSelfLabel(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#selfLabel', v)
+export function validateSelfLabel(v: unknown) {
+  return lexicons.validate(`${id}#selfLabel`, v) as ValidationResult<SelfLabel>
 }
 
 /** Declares a label value and its expected interpretations and behaviors. */
@@ -94,16 +93,19 @@ export interface LabelValueDefinition {
   [k: string]: unknown
 }
 
-export function isLabelValueDefinition(v: unknown): v is LabelValueDefinition {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#labelValueDefinition'
-  )
+export function isLabelValueDefinition(
+  v: unknown,
+): v is LabelValueDefinition & {
+  $type: $Type<'com.atproto.label.defs', 'labelValueDefinition'>
+} {
+  return is$typed(v, id, 'labelValueDefinition')
 }
 
-export function validateLabelValueDefinition(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.defs#labelValueDefinition', v)
+export function validateLabelValueDefinition(v: unknown) {
+  return lexicons.validate(
+    `${id}#labelValueDefinition`,
+    v,
+  ) as ValidationResult<LabelValueDefinition>
 }
 
 /** Strings which describe the label in the UI, localized into a specific language. */
@@ -119,21 +121,17 @@ export interface LabelValueDefinitionStrings {
 
 export function isLabelValueDefinitionStrings(
   v: unknown,
-): v is LabelValueDefinitionStrings {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.defs#labelValueDefinitionStrings'
-  )
+): v is LabelValueDefinitionStrings & {
+  $type: $Type<'com.atproto.label.defs', 'labelValueDefinitionStrings'>
+} {
+  return is$typed(v, id, 'labelValueDefinitionStrings')
 }
 
-export function validateLabelValueDefinitionStrings(
-  v: unknown,
-): ValidationResult {
+export function validateLabelValueDefinitionStrings(v: unknown) {
   return lexicons.validate(
-    'com.atproto.label.defs#labelValueDefinitionStrings',
+    `${id}#labelValueDefinitionStrings`,
     v,
-  )
+  ) as ValidationResult<LabelValueDefinitionStrings>
 }
 
 export type LabelValue =
diff --git a/packages/pds/src/lexicon/types/com/atproto/label/queryLabels.ts b/packages/pds/src/lexicon/types/com/atproto/label/queryLabels.ts
index 0c9d55a6961..62d114a2685 100644
--- a/packages/pds/src/lexicon/types/com/atproto/label/queryLabels.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/label/queryLabels.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoLabelDefs from './defs'
 
+const id = 'com.atproto.label.queryLabels'
+
 export interface QueryParams {
   /** List of AT URI patterns to match (boolean 'OR'). Each may be a prefix (ending with '*'; will match inclusive of the string leading to '*'), or a full URI. */
   uriPatterns: string[]
diff --git a/packages/pds/src/lexicon/types/com/atproto/label/subscribeLabels.ts b/packages/pds/src/lexicon/types/com/atproto/label/subscribeLabels.ts
index 6034b35d895..f84267b7075 100644
--- a/packages/pds/src/lexicon/types/com/atproto/label/subscribeLabels.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/label/subscribeLabels.ts
@@ -2,13 +2,15 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, ErrorFrame } from '@atproto/xrpc-server'
 import { IncomingMessage } from 'http'
 import * as ComAtprotoLabelDefs from './defs'
 
+const id = 'com.atproto.label.subscribeLabels'
+
 export interface QueryParams {
   /** The last known event seq number to backfill from. */
   cursor?: number
@@ -36,16 +38,14 @@ export interface Labels {
   [k: string]: unknown
 }
 
-export function isLabels(v: unknown): v is Labels {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.subscribeLabels#labels'
-  )
+export function isLabels(v: unknown): v is Labels & {
+  $type: $Type<'com.atproto.label.subscribeLabels', 'labels'>
+} {
+  return is$typed(v, id, 'labels')
 }
 
-export function validateLabels(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.subscribeLabels#labels', v)
+export function validateLabels(v: unknown) {
+  return lexicons.validate(`${id}#labels`, v) as ValidationResult<Labels>
 }
 
 export interface Info {
@@ -54,14 +54,12 @@ export interface Info {
   [k: string]: unknown
 }
 
-export function isInfo(v: unknown): v is Info {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.label.subscribeLabels#info'
-  )
+export function isInfo(
+  v: unknown,
+): v is Info & { $type: $Type<'com.atproto.label.subscribeLabels', 'info'> } {
+  return is$typed(v, id, 'info')
 }
 
-export function validateInfo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.label.subscribeLabels#info', v)
+export function validateInfo(v: unknown) {
+  return lexicons.validate(`${id}#info`, v) as ValidationResult<Info>
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/moderation/createReport.ts b/packages/pds/src/lexicon/types/com/atproto/moderation/createReport.ts
index aa3f810a91c..5095d72d1fe 100644
--- a/packages/pds/src/lexicon/types/com/atproto/moderation/createReport.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/moderation/createReport.ts
@@ -3,14 +3,16 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoModerationDefs from './defs'
 import * as ComAtprotoAdminDefs from '../admin/defs'
 import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 
+const id = 'com.atproto.moderation.createReport'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/moderation/defs.ts b/packages/pds/src/lexicon/types/com/atproto/moderation/defs.ts
index 08e555c2422..ed67a387dd5 100644
--- a/packages/pds/src/lexicon/types/com/atproto/moderation/defs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/moderation/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'com.atproto.moderation.defs'
 
 export type ReasonType =
   | 'com.atproto.moderation.defs#reasonSpam'
@@ -17,16 +19,16 @@ export type ReasonType =
   | (string & {})
 
 /** Spam: frequent unwanted promotion, replies, mentions */
-export const REASONSPAM = 'com.atproto.moderation.defs#reasonSpam'
+export const REASONSPAM = `${id}#reasonSpam`
 /** Direct violation of server rules, laws, terms of service */
-export const REASONVIOLATION = 'com.atproto.moderation.defs#reasonViolation'
+export const REASONVIOLATION = `${id}#reasonViolation`
 /** Misleading identity, affiliation, or content */
-export const REASONMISLEADING = 'com.atproto.moderation.defs#reasonMisleading'
+export const REASONMISLEADING = `${id}#reasonMisleading`
 /** Unwanted or mislabeled sexual content */
-export const REASONSEXUAL = 'com.atproto.moderation.defs#reasonSexual'
+export const REASONSEXUAL = `${id}#reasonSexual`
 /** Rude, harassing, explicit, or otherwise unwelcoming behavior */
-export const REASONRUDE = 'com.atproto.moderation.defs#reasonRude'
+export const REASONRUDE = `${id}#reasonRude`
 /** Other: reports not falling under another report category */
-export const REASONOTHER = 'com.atproto.moderation.defs#reasonOther'
+export const REASONOTHER = `${id}#reasonOther`
 /** Appeal: appeal a previously taken moderation action */
-export const REASONAPPEAL = 'com.atproto.moderation.defs#reasonAppeal'
+export const REASONAPPEAL = `${id}#reasonAppeal`
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/applyWrites.ts b/packages/pds/src/lexicon/types/com/atproto/repo/applyWrites.ts
index 4e3c8dcef3d..9e171a111c5 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/applyWrites.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/applyWrites.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoRepoDefs from './defs'
 
+const id = 'com.atproto.repo.applyWrites'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -65,16 +67,14 @@ export interface Create {
   [k: string]: unknown
 }
 
-export function isCreate(v: unknown): v is Create {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#create'
-  )
+export function isCreate(
+  v: unknown,
+): v is Create & { $type: $Type<'com.atproto.repo.applyWrites', 'create'> } {
+  return is$typed(v, id, 'create')
 }
 
-export function validateCreate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#create', v)
+export function validateCreate(v: unknown) {
+  return lexicons.validate(`${id}#create`, v) as ValidationResult<Create>
 }
 
 /** Operation which updates an existing record. */
@@ -85,16 +85,14 @@ export interface Update {
   [k: string]: unknown
 }
 
-export function isUpdate(v: unknown): v is Update {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#update'
-  )
+export function isUpdate(
+  v: unknown,
+): v is Update & { $type: $Type<'com.atproto.repo.applyWrites', 'update'> } {
+  return is$typed(v, id, 'update')
 }
 
-export function validateUpdate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#update', v)
+export function validateUpdate(v: unknown) {
+  return lexicons.validate(`${id}#update`, v) as ValidationResult<Update>
 }
 
 /** Operation which deletes an existing record. */
@@ -104,16 +102,14 @@ export interface Delete {
   [k: string]: unknown
 }
 
-export function isDelete(v: unknown): v is Delete {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#delete'
-  )
+export function isDelete(
+  v: unknown,
+): v is Delete & { $type: $Type<'com.atproto.repo.applyWrites', 'delete'> } {
+  return is$typed(v, id, 'delete')
 }
 
-export function validateDelete(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#delete', v)
+export function validateDelete(v: unknown) {
+  return lexicons.validate(`${id}#delete`, v) as ValidationResult<Delete>
 }
 
 export interface CreateResult {
@@ -123,16 +119,17 @@ export interface CreateResult {
   [k: string]: unknown
 }
 
-export function isCreateResult(v: unknown): v is CreateResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#createResult'
-  )
+export function isCreateResult(v: unknown): v is CreateResult & {
+  $type: $Type<'com.atproto.repo.applyWrites', 'createResult'>
+} {
+  return is$typed(v, id, 'createResult')
 }
 
-export function validateCreateResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#createResult', v)
+export function validateCreateResult(v: unknown) {
+  return lexicons.validate(
+    `${id}#createResult`,
+    v,
+  ) as ValidationResult<CreateResult>
 }
 
 export interface UpdateResult {
@@ -142,30 +139,32 @@ export interface UpdateResult {
   [k: string]: unknown
 }
 
-export function isUpdateResult(v: unknown): v is UpdateResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#updateResult'
-  )
+export function isUpdateResult(v: unknown): v is UpdateResult & {
+  $type: $Type<'com.atproto.repo.applyWrites', 'updateResult'>
+} {
+  return is$typed(v, id, 'updateResult')
 }
 
-export function validateUpdateResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#updateResult', v)
+export function validateUpdateResult(v: unknown) {
+  return lexicons.validate(
+    `${id}#updateResult`,
+    v,
+  ) as ValidationResult<UpdateResult>
 }
 
 export interface DeleteResult {
   [k: string]: unknown
 }
 
-export function isDeleteResult(v: unknown): v is DeleteResult {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.applyWrites#deleteResult'
-  )
+export function isDeleteResult(v: unknown): v is DeleteResult & {
+  $type: $Type<'com.atproto.repo.applyWrites', 'deleteResult'>
+} {
+  return is$typed(v, id, 'deleteResult')
 }
 
-export function validateDeleteResult(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.applyWrites#deleteResult', v)
+export function validateDeleteResult(v: unknown) {
+  return lexicons.validate(
+    `${id}#deleteResult`,
+    v,
+  ) as ValidationResult<DeleteResult>
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/createRecord.ts b/packages/pds/src/lexicon/types/com/atproto/repo/createRecord.ts
index 5cac0848bf1..b155d82b176 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/createRecord.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/createRecord.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoRepoDefs from './defs'
 
+const id = 'com.atproto.repo.createRecord'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/defs.ts b/packages/pds/src/lexicon/types/com/atproto/repo/defs.ts
index 8357fe2a611..eeb0b484b7e 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/defs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'com.atproto.repo.defs'
 
 export interface CommitMeta {
   cid: string
@@ -12,14 +14,15 @@ export interface CommitMeta {
   [k: string]: unknown
 }
 
-export function isCommitMeta(v: unknown): v is CommitMeta {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.defs#commitMeta'
-  )
+export function isCommitMeta(
+  v: unknown,
+): v is CommitMeta & { $type: $Type<'com.atproto.repo.defs', 'commitMeta'> } {
+  return is$typed(v, id, 'commitMeta')
 }
 
-export function validateCommitMeta(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.defs#commitMeta', v)
+export function validateCommitMeta(v: unknown) {
+  return lexicons.validate(
+    `${id}#commitMeta`,
+    v,
+  ) as ValidationResult<CommitMeta>
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/deleteRecord.ts b/packages/pds/src/lexicon/types/com/atproto/repo/deleteRecord.ts
index e594cd00adf..f285caa3e28 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/deleteRecord.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/deleteRecord.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoRepoDefs from './defs'
 
+const id = 'com.atproto.repo.deleteRecord'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/describeRepo.ts b/packages/pds/src/lexicon/types/com/atproto/repo/describeRepo.ts
index 749bedcfeb7..b3774866513 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/describeRepo.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/describeRepo.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.repo.describeRepo'
+
 export interface QueryParams {
   /** The handle or DID of the repo. */
   repo: string
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/getRecord.ts b/packages/pds/src/lexicon/types/com/atproto/repo/getRecord.ts
index 9d03da19530..ff0baecfadd 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/getRecord.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/getRecord.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.repo.getRecord'
+
 export interface QueryParams {
   /** The handle or DID of the repo. */
   repo: string
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/importRepo.ts b/packages/pds/src/lexicon/types/com/atproto/repo/importRepo.ts
index 59288c7a027..3dfc0334549 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/importRepo.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/importRepo.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.repo.importRepo'
+
 export interface QueryParams {}
 
 export type InputSchema = string | Uint8Array | Blob
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts b/packages/pds/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
index 40f4d385e47..e79f4d6a71e 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/listMissingBlobs.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.repo.listMissingBlobs'
+
 export interface QueryParams {
   limit: number
   cursor?: string
@@ -52,14 +54,15 @@ export interface RecordBlob {
   [k: string]: unknown
 }
 
-export function isRecordBlob(v: unknown): v is RecordBlob {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.listMissingBlobs#recordBlob'
-  )
+export function isRecordBlob(v: unknown): v is RecordBlob & {
+  $type: $Type<'com.atproto.repo.listMissingBlobs', 'recordBlob'>
+} {
+  return is$typed(v, id, 'recordBlob')
 }
 
-export function validateRecordBlob(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.listMissingBlobs#recordBlob', v)
+export function validateRecordBlob(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordBlob`,
+    v,
+  ) as ValidationResult<RecordBlob>
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/listRecords.ts b/packages/pds/src/lexicon/types/com/atproto/repo/listRecords.ts
index f46f6eb0f7f..51b1393b9a8 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/listRecords.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/listRecords.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.repo.listRecords'
+
 export interface QueryParams {
   /** The handle or DID of the repo. */
   repo: string
@@ -64,14 +66,12 @@ export interface Record {
   [k: string]: unknown
 }
 
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.repo.listRecords#record'
-  )
+export function isRecord(
+  v: unknown,
+): v is Record & { $type: $Type<'com.atproto.repo.listRecords', 'record'> } {
+  return is$typed(v, id, 'record')
 }
 
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.listRecords#record', v)
+export function validateRecord(v: unknown) {
+  return lexicons.validate(`${id}#record`, v) as ValidationResult<Record>
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/putRecord.ts b/packages/pds/src/lexicon/types/com/atproto/repo/putRecord.ts
index 5cde768d7c2..427fcd8920d 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/putRecord.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/putRecord.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoRepoDefs from './defs'
 
+const id = 'com.atproto.repo.putRecord'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/strongRef.ts b/packages/pds/src/lexicon/types/com/atproto/repo/strongRef.ts
index 8b21a6ddf81..a9298dcbe55 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/strongRef.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/strongRef.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'com.atproto.repo.strongRef'
 
 export interface Main {
   uri: string
@@ -12,15 +14,12 @@ export interface Main {
   [k: string]: unknown
 }
 
-export function isMain(v: unknown): v is Main {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'com.atproto.repo.strongRef#main' ||
-      v.$type === 'com.atproto.repo.strongRef')
-  )
+export function isMain(
+  v: unknown,
+): v is Main & { $type: $Type<'com.atproto.repo.strongRef', 'main'> } {
+  return is$typed(v, id, 'main')
 }
 
-export function validateMain(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.repo.strongRef#main', v)
+export function validateMain(v: unknown) {
+  return lexicons.validate(`${id}#main`, v) as ValidationResult<Main>
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/repo/uploadBlob.ts b/packages/pds/src/lexicon/types/com/atproto/repo/uploadBlob.ts
index 4a712346a0b..7fc4618b664 100644
--- a/packages/pds/src/lexicon/types/com/atproto/repo/uploadBlob.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/repo/uploadBlob.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.repo.uploadBlob'
+
 export interface QueryParams {}
 
 export type InputSchema = string | Uint8Array | Blob
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/activateAccount.ts b/packages/pds/src/lexicon/types/com/atproto/server/activateAccount.ts
index 82672f1d1c7..886a33d1e19 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/activateAccount.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/activateAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.activateAccount'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/checkAccountStatus.ts b/packages/pds/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
index f17182a8dce..730ec6aca5b 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/checkAccountStatus.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.checkAccountStatus'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/confirmEmail.ts b/packages/pds/src/lexicon/types/com/atproto/server/confirmEmail.ts
index b667a04b996..f681b0a1e2f 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/confirmEmail.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/confirmEmail.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.confirmEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/createAccount.ts b/packages/pds/src/lexicon/types/com/atproto/server/createAccount.ts
index 6e9b2f9f3c2..bd033e64df2 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/createAccount.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/createAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.createAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/createAppPassword.ts b/packages/pds/src/lexicon/types/com/atproto/server/createAppPassword.ts
index 00657a2058f..98a4ce7f174 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/createAppPassword.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/createAppPassword.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.createAppPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -57,17 +59,15 @@ export interface AppPassword {
   [k: string]: unknown
 }
 
-export function isAppPassword(v: unknown): v is AppPassword {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.createAppPassword#appPassword'
-  )
+export function isAppPassword(v: unknown): v is AppPassword & {
+  $type: $Type<'com.atproto.server.createAppPassword', 'appPassword'>
+} {
+  return is$typed(v, id, 'appPassword')
 }
 
-export function validateAppPassword(v: unknown): ValidationResult {
+export function validateAppPassword(v: unknown) {
   return lexicons.validate(
-    'com.atproto.server.createAppPassword#appPassword',
+    `${id}#appPassword`,
     v,
-  )
+  ) as ValidationResult<AppPassword>
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/createInviteCode.ts b/packages/pds/src/lexicon/types/com/atproto/server/createInviteCode.ts
index 9cfeacc7e28..27150f98e8a 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/createInviteCode.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/createInviteCode.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.createInviteCode'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/createInviteCodes.ts b/packages/pds/src/lexicon/types/com/atproto/server/createInviteCodes.ts
index eb6cd2bb1b1..32719ec8d85 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/createInviteCodes.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/createInviteCodes.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.createInviteCodes'
+
 export interface QueryParams {}
 
 export interface InputSchema {
@@ -56,17 +58,15 @@ export interface AccountCodes {
   [k: string]: unknown
 }
 
-export function isAccountCodes(v: unknown): v is AccountCodes {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.createInviteCodes#accountCodes'
-  )
+export function isAccountCodes(v: unknown): v is AccountCodes & {
+  $type: $Type<'com.atproto.server.createInviteCodes', 'accountCodes'>
+} {
+  return is$typed(v, id, 'accountCodes')
 }
 
-export function validateAccountCodes(v: unknown): ValidationResult {
+export function validateAccountCodes(v: unknown) {
   return lexicons.validate(
-    'com.atproto.server.createInviteCodes#accountCodes',
+    `${id}#accountCodes`,
     v,
-  )
+  ) as ValidationResult<AccountCodes>
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/createSession.ts b/packages/pds/src/lexicon/types/com/atproto/server/createSession.ts
index 96f7d79d5bc..8d846520ae9 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/createSession.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/createSession.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.createSession'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/deactivateAccount.ts b/packages/pds/src/lexicon/types/com/atproto/server/deactivateAccount.ts
index b3793d6b2e0..126255afd0d 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/deactivateAccount.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/deactivateAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.deactivateAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/defs.ts b/packages/pds/src/lexicon/types/com/atproto/server/defs.ts
index 9bd67c9d7a5..e16c0153d90 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/defs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'com.atproto.server.defs'
 
 export interface InviteCode {
   code: string
@@ -17,16 +19,17 @@ export interface InviteCode {
   [k: string]: unknown
 }
 
-export function isInviteCode(v: unknown): v is InviteCode {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.defs#inviteCode'
-  )
+export function isInviteCode(
+  v: unknown,
+): v is InviteCode & { $type: $Type<'com.atproto.server.defs', 'inviteCode'> } {
+  return is$typed(v, id, 'inviteCode')
 }
 
-export function validateInviteCode(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.defs#inviteCode', v)
+export function validateInviteCode(v: unknown) {
+  return lexicons.validate(
+    `${id}#inviteCode`,
+    v,
+  ) as ValidationResult<InviteCode>
 }
 
 export interface InviteCodeUse {
@@ -35,14 +38,15 @@ export interface InviteCodeUse {
   [k: string]: unknown
 }
 
-export function isInviteCodeUse(v: unknown): v is InviteCodeUse {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.defs#inviteCodeUse'
-  )
+export function isInviteCodeUse(v: unknown): v is InviteCodeUse & {
+  $type: $Type<'com.atproto.server.defs', 'inviteCodeUse'>
+} {
+  return is$typed(v, id, 'inviteCodeUse')
 }
 
-export function validateInviteCodeUse(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.defs#inviteCodeUse', v)
+export function validateInviteCodeUse(v: unknown) {
+  return lexicons.validate(
+    `${id}#inviteCodeUse`,
+    v,
+  ) as ValidationResult<InviteCodeUse>
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/deleteAccount.ts b/packages/pds/src/lexicon/types/com/atproto/server/deleteAccount.ts
index 4fcec360a11..e082e24ae10 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/deleteAccount.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/deleteAccount.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.deleteAccount'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/deleteSession.ts b/packages/pds/src/lexicon/types/com/atproto/server/deleteSession.ts
index 82672f1d1c7..90c6882cf87 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/deleteSession.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/deleteSession.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.deleteSession'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/describeServer.ts b/packages/pds/src/lexicon/types/com/atproto/server/describeServer.ts
index e21868158b3..0e4fc1fc242 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/describeServer.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/describeServer.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.describeServer'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -56,16 +58,14 @@ export interface Links {
   [k: string]: unknown
 }
 
-export function isLinks(v: unknown): v is Links {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.describeServer#links'
-  )
+export function isLinks(
+  v: unknown,
+): v is Links & { $type: $Type<'com.atproto.server.describeServer', 'links'> } {
+  return is$typed(v, id, 'links')
 }
 
-export function validateLinks(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.describeServer#links', v)
+export function validateLinks(v: unknown) {
+  return lexicons.validate(`${id}#links`, v) as ValidationResult<Links>
 }
 
 export interface Contact {
@@ -73,14 +73,12 @@ export interface Contact {
   [k: string]: unknown
 }
 
-export function isContact(v: unknown): v is Contact {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.describeServer#contact'
-  )
+export function isContact(v: unknown): v is Contact & {
+  $type: $Type<'com.atproto.server.describeServer', 'contact'>
+} {
+  return is$typed(v, id, 'contact')
 }
 
-export function validateContact(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.describeServer#contact', v)
+export function validateContact(v: unknown) {
+  return lexicons.validate(`${id}#contact`, v) as ValidationResult<Contact>
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts b/packages/pds/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
index 82c3ffa8c31..9668cf1f1e6 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/getAccountInviteCodes.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoServerDefs from './defs'
 
+const id = 'com.atproto.server.getAccountInviteCodes'
+
 export interface QueryParams {
   includeUsed: boolean
   /** Controls whether any new 'earned' but not 'created' invites should be created. */
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/getServiceAuth.ts b/packages/pds/src/lexicon/types/com/atproto/server/getServiceAuth.ts
index 14f249fde44..54b3a3d4423 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/getServiceAuth.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/getServiceAuth.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.getServiceAuth'
+
 export interface QueryParams {
   /** The DID of the service that the token will be used to authenticate with */
   aud: string
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/getSession.ts b/packages/pds/src/lexicon/types/com/atproto/server/getSession.ts
index be34cb92afd..e98c753d9d0 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/getSession.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/getSession.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.getSession'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/listAppPasswords.ts b/packages/pds/src/lexicon/types/com/atproto/server/listAppPasswords.ts
index 397e7043e67..085637d4e51 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/listAppPasswords.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/listAppPasswords.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.listAppPasswords'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -50,14 +52,15 @@ export interface AppPassword {
   [k: string]: unknown
 }
 
-export function isAppPassword(v: unknown): v is AppPassword {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.server.listAppPasswords#appPassword'
-  )
+export function isAppPassword(v: unknown): v is AppPassword & {
+  $type: $Type<'com.atproto.server.listAppPasswords', 'appPassword'>
+} {
+  return is$typed(v, id, 'appPassword')
 }
 
-export function validateAppPassword(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.server.listAppPasswords#appPassword', v)
+export function validateAppPassword(v: unknown) {
+  return lexicons.validate(
+    `${id}#appPassword`,
+    v,
+  ) as ValidationResult<AppPassword>
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/refreshSession.ts b/packages/pds/src/lexicon/types/com/atproto/server/refreshSession.ts
index 1d6272a0d71..de1b570bf1a 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/refreshSession.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/refreshSession.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.refreshSession'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/requestAccountDelete.ts b/packages/pds/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
index 82672f1d1c7..85131190ec9 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/requestAccountDelete.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.requestAccountDelete'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts b/packages/pds/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
index 82672f1d1c7..fb58814aeb4 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/requestEmailConfirmation.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.requestEmailConfirmation'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts b/packages/pds/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
index 24dce3e12af..919e704328a 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/requestEmailUpdate.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.requestEmailUpdate'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/requestPasswordReset.ts b/packages/pds/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
index d0f3f2ad769..f9bcec52a1f 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/requestPasswordReset.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.requestPasswordReset'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/reserveSigningKey.ts b/packages/pds/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
index 0ec1e80c77c..64dfb8c8414 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/reserveSigningKey.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.reserveSigningKey'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/resetPassword.ts b/packages/pds/src/lexicon/types/com/atproto/server/resetPassword.ts
index 38f63382cf0..d842e7e266d 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/resetPassword.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/resetPassword.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.resetPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/revokeAppPassword.ts b/packages/pds/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
index 769ad6aa521..92a8204560e 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/revokeAppPassword.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.revokeAppPassword'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/server/updateEmail.ts b/packages/pds/src/lexicon/types/com/atproto/server/updateEmail.ts
index 34fc7421979..4381078a0a6 100644
--- a/packages/pds/src/lexicon/types/com/atproto/server/updateEmail.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/server/updateEmail.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.server.updateEmail'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getBlob.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getBlob.ts
index b1581d6e473..d42913abd01 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getBlob.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getBlob.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.getBlob'
+
 export interface QueryParams {
   /** The DID of the account. */
   did: string
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getBlocks.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getBlocks.ts
index 925b4a7d50b..a7dc7e73000 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getBlocks.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getBlocks.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.getBlocks'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getCheckout.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getCheckout.ts
index 51856b9088d..53d5b4bf39b 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getCheckout.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getCheckout.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.getCheckout'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getHead.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getHead.ts
index adedd4cf211..1adceb80d8a 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getHead.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getHead.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.getHead'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getLatestCommit.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
index f0e9a757d04..290c02e15fa 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getLatestCommit.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.getLatestCommit'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getRecord.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getRecord.ts
index 83d88655228..8f03eb23951 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getRecord.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getRecord.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.getRecord'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getRepo.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getRepo.ts
index 883ff37def1..9cde9a4e01b 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getRepo.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getRepo.ts
@@ -4,11 +4,13 @@
 import express from 'express'
 import stream from 'stream'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.getRepo'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/getRepoStatus.ts b/packages/pds/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
index 00abbeaa84b..414e67e7a67 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/getRepoStatus.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.getRepoStatus'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/listBlobs.ts b/packages/pds/src/lexicon/types/com/atproto/sync/listBlobs.ts
index c6ea955ee0c..58fea9c1282 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/listBlobs.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/listBlobs.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.listBlobs'
+
 export interface QueryParams {
   /** The DID of the repo. */
   did: string
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/listRepos.ts b/packages/pds/src/lexicon/types/com/atproto/sync/listRepos.ts
index 5628b0b5147..468977d448c 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/listRepos.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/listRepos.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.listRepos'
+
 export interface QueryParams {
   limit: number
   cursor?: string
@@ -57,14 +59,12 @@ export interface Repo {
   [k: string]: unknown
 }
 
-export function isRepo(v: unknown): v is Repo {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.listRepos#repo'
-  )
+export function isRepo(
+  v: unknown,
+): v is Repo & { $type: $Type<'com.atproto.sync.listRepos', 'repo'> } {
+  return is$typed(v, id, 'repo')
 }
 
-export function validateRepo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.listRepos#repo', v)
+export function validateRepo(v: unknown) {
+  return lexicons.validate(`${id}#repo`, v) as ValidationResult<Repo>
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts b/packages/pds/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
index 8a0af577c7c..8fd62afe59e 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/notifyOfUpdate.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.notifyOfUpdate'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/requestCrawl.ts b/packages/pds/src/lexicon/types/com/atproto/sync/requestCrawl.ts
index 31180aabf58..5148b8c5f24 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/requestCrawl.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/requestCrawl.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.sync.requestCrawl'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/subscribeRepos.ts b/packages/pds/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
index 8f9855a5da4..b986110ccbe 100644
--- a/packages/pds/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
@@ -2,12 +2,14 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, ErrorFrame } from '@atproto/xrpc-server'
 import { IncomingMessage } from 'http'
 
+const id = 'com.atproto.sync.subscribeRepos'
+
 export interface QueryParams {
   /** The last known event seq number to backfill from. */
   cursor?: number
@@ -61,16 +63,14 @@ export interface Commit {
   [k: string]: unknown
 }
 
-export function isCommit(v: unknown): v is Commit {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#commit'
-  )
+export function isCommit(
+  v: unknown,
+): v is Commit & { $type: $Type<'com.atproto.sync.subscribeRepos', 'commit'> } {
+  return is$typed(v, id, 'commit')
 }
 
-export function validateCommit(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#commit', v)
+export function validateCommit(v: unknown) {
+  return lexicons.validate(`${id}#commit`, v) as ValidationResult<Commit>
 }
 
 /** Represents a change to an account's identity. Could be an updated handle, signing key, or pds hosting endpoint. Serves as a prod to all downstream services to refresh their identity cache. */
@@ -83,16 +83,14 @@ export interface Identity {
   [k: string]: unknown
 }
 
-export function isIdentity(v: unknown): v is Identity {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#identity'
-  )
+export function isIdentity(v: unknown): v is Identity & {
+  $type: $Type<'com.atproto.sync.subscribeRepos', 'identity'>
+} {
+  return is$typed(v, id, 'identity')
 }
 
-export function validateIdentity(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#identity', v)
+export function validateIdentity(v: unknown) {
+  return lexicons.validate(`${id}#identity`, v) as ValidationResult<Identity>
 }
 
 /** Represents a change to an account's status on a host (eg, PDS or Relay). The semantics of this event are that the status is at the host which emitted the event, not necessarily that at the currently active PDS. Eg, a Relay takedown would emit a takedown with active=false, even if the PDS is still active. */
@@ -107,16 +105,14 @@ export interface Account {
   [k: string]: unknown
 }
 
-export function isAccount(v: unknown): v is Account {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#account'
-  )
+export function isAccount(v: unknown): v is Account & {
+  $type: $Type<'com.atproto.sync.subscribeRepos', 'account'>
+} {
+  return is$typed(v, id, 'account')
 }
 
-export function validateAccount(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#account', v)
+export function validateAccount(v: unknown) {
+  return lexicons.validate(`${id}#account`, v) as ValidationResult<Account>
 }
 
 /** DEPRECATED -- Use #identity event instead */
@@ -128,16 +124,14 @@ export interface Handle {
   [k: string]: unknown
 }
 
-export function isHandle(v: unknown): v is Handle {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#handle'
-  )
+export function isHandle(
+  v: unknown,
+): v is Handle & { $type: $Type<'com.atproto.sync.subscribeRepos', 'handle'> } {
+  return is$typed(v, id, 'handle')
 }
 
-export function validateHandle(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#handle', v)
+export function validateHandle(v: unknown) {
+  return lexicons.validate(`${id}#handle`, v) as ValidationResult<Handle>
 }
 
 /** DEPRECATED -- Use #account event instead */
@@ -149,16 +143,14 @@ export interface Migrate {
   [k: string]: unknown
 }
 
-export function isMigrate(v: unknown): v is Migrate {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#migrate'
-  )
+export function isMigrate(v: unknown): v is Migrate & {
+  $type: $Type<'com.atproto.sync.subscribeRepos', 'migrate'>
+} {
+  return is$typed(v, id, 'migrate')
 }
 
-export function validateMigrate(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#migrate', v)
+export function validateMigrate(v: unknown) {
+  return lexicons.validate(`${id}#migrate`, v) as ValidationResult<Migrate>
 }
 
 /** DEPRECATED -- Use #account event instead */
@@ -169,16 +161,14 @@ export interface Tombstone {
   [k: string]: unknown
 }
 
-export function isTombstone(v: unknown): v is Tombstone {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#tombstone'
-  )
+export function isTombstone(v: unknown): v is Tombstone & {
+  $type: $Type<'com.atproto.sync.subscribeRepos', 'tombstone'>
+} {
+  return is$typed(v, id, 'tombstone')
 }
 
-export function validateTombstone(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#tombstone', v)
+export function validateTombstone(v: unknown) {
+  return lexicons.validate(`${id}#tombstone`, v) as ValidationResult<Tombstone>
 }
 
 export interface Info {
@@ -187,16 +177,14 @@ export interface Info {
   [k: string]: unknown
 }
 
-export function isInfo(v: unknown): v is Info {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#info'
-  )
+export function isInfo(
+  v: unknown,
+): v is Info & { $type: $Type<'com.atproto.sync.subscribeRepos', 'info'> } {
+  return is$typed(v, id, 'info')
 }
 
-export function validateInfo(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#info', v)
+export function validateInfo(v: unknown) {
+  return lexicons.validate(`${id}#info`, v) as ValidationResult<Info>
 }
 
 /** A repo operation, ie a mutation of a single record. */
@@ -208,14 +196,12 @@ export interface RepoOp {
   [k: string]: unknown
 }
 
-export function isRepoOp(v: unknown): v is RepoOp {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.sync.subscribeRepos#repoOp'
-  )
+export function isRepoOp(
+  v: unknown,
+): v is RepoOp & { $type: $Type<'com.atproto.sync.subscribeRepos', 'repoOp'> } {
+  return is$typed(v, id, 'repoOp')
 }
 
-export function validateRepoOp(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.sync.subscribeRepos#repoOp', v)
+export function validateRepoOp(v: unknown) {
+  return lexicons.validate(`${id}#repoOp`, v) as ValidationResult<RepoOp>
 }
diff --git a/packages/pds/src/lexicon/types/com/atproto/temp/addReservedHandle.ts b/packages/pds/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
index b884cb08998..374ab85c589 100644
--- a/packages/pds/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/temp/addReservedHandle.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.temp.addReservedHandle'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts b/packages/pds/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
index 9486bce2b2b..948068c5a6d 100644
--- a/packages/pds/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/temp/checkSignupQueue.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.temp.checkSignupQueue'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/pds/src/lexicon/types/com/atproto/temp/fetchLabels.ts b/packages/pds/src/lexicon/types/com/atproto/temp/fetchLabels.ts
index 0fbdeed1196..c8741a1331b 100644
--- a/packages/pds/src/lexicon/types/com/atproto/temp/fetchLabels.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/temp/fetchLabels.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoLabelDefs from '../label/defs'
 
+const id = 'com.atproto.temp.fetchLabels'
+
 export interface QueryParams {
   since?: number
   limit: number
diff --git a/packages/pds/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts b/packages/pds/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
index c977500fc33..556fe779d21 100644
--- a/packages/pds/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
+++ b/packages/pds/src/lexicon/types/com/atproto/temp/requestPhoneVerification.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'com.atproto.temp.requestPhoneVerification'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/communication/createTemplate.ts b/packages/pds/src/lexicon/types/tools/ozone/communication/createTemplate.ts
index 6d29f93bdba..b82931c64c7 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/communication/createTemplate.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/communication/createTemplate.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneCommunicationDefs from './defs'
 
+const id = 'tools.ozone.communication.createTemplate'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/communication/defs.ts b/packages/pds/src/lexicon/types/tools/ozone/communication/defs.ts
index 1342dc3c399..13fcc5b58d6 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/communication/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/communication/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'tools.ozone.communication.defs'
 
 export interface TemplateView {
   id: string
@@ -24,14 +26,15 @@ export interface TemplateView {
   [k: string]: unknown
 }
 
-export function isTemplateView(v: unknown): v is TemplateView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.communication.defs#templateView'
-  )
+export function isTemplateView(v: unknown): v is TemplateView & {
+  $type: $Type<'tools.ozone.communication.defs', 'templateView'>
+} {
+  return is$typed(v, id, 'templateView')
 }
 
-export function validateTemplateView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.communication.defs#templateView', v)
+export function validateTemplateView(v: unknown) {
+  return lexicons.validate(
+    `${id}#templateView`,
+    v,
+  ) as ValidationResult<TemplateView>
 }
diff --git a/packages/pds/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts b/packages/pds/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts
index c5ae5cd469f..bcdc2b523b1 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/communication/deleteTemplate.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'tools.ozone.communication.deleteTemplate'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/communication/listTemplates.ts b/packages/pds/src/lexicon/types/tools/ozone/communication/listTemplates.ts
index 4573ac7bbb9..74260b5c495 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/communication/listTemplates.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/communication/listTemplates.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneCommunicationDefs from './defs'
 
+const id = 'tools.ozone.communication.listTemplates'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
diff --git a/packages/pds/src/lexicon/types/tools/ozone/communication/updateTemplate.ts b/packages/pds/src/lexicon/types/tools/ozone/communication/updateTemplate.ts
index f8c5817b4d9..e7bcacb14ff 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/communication/updateTemplate.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/communication/updateTemplate.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneCommunicationDefs from './defs'
 
+const id = 'tools.ozone.communication.updateTemplate'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts
index 403f7832a6d..56a822245e7 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/defs.ts
@@ -2,9 +2,9 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 import * as ChatBskyConvoDefs from '../../../chat/bsky/convo/defs'
@@ -12,6 +12,8 @@ import * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs'
 import * as ComAtprotoServerDefs from '../../../com/atproto/server/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 
+const id = 'tools.ozone.moderation.defs'
+
 export interface ModEventView {
   id: number
   event:
@@ -47,16 +49,17 @@ export interface ModEventView {
   [k: string]: unknown
 }
 
-export function isModEventView(v: unknown): v is ModEventView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventView'
-  )
+export function isModEventView(v: unknown): v is ModEventView & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventView'>
+} {
+  return is$typed(v, id, 'modEventView')
 }
 
-export function validateModEventView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventView', v)
+export function validateModEventView(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventView`,
+    v,
+  ) as ValidationResult<ModEventView>
 }
 
 export interface ModEventViewDetail {
@@ -93,16 +96,17 @@ export interface ModEventViewDetail {
   [k: string]: unknown
 }
 
-export function isModEventViewDetail(v: unknown): v is ModEventViewDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventViewDetail'
-  )
+export function isModEventViewDetail(v: unknown): v is ModEventViewDetail & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventViewDetail'>
+} {
+  return is$typed(v, id, 'modEventViewDetail')
 }
 
-export function validateModEventViewDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventViewDetail', v)
+export function validateModEventViewDetail(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventViewDetail`,
+    v,
+  ) as ValidationResult<ModEventViewDetail>
 }
 
 export interface SubjectStatusView {
@@ -139,16 +143,17 @@ export interface SubjectStatusView {
   [k: string]: unknown
 }
 
-export function isSubjectStatusView(v: unknown): v is SubjectStatusView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#subjectStatusView'
-  )
+export function isSubjectStatusView(v: unknown): v is SubjectStatusView & {
+  $type: $Type<'tools.ozone.moderation.defs', 'subjectStatusView'>
+} {
+  return is$typed(v, id, 'subjectStatusView')
 }
 
-export function validateSubjectStatusView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#subjectStatusView', v)
+export function validateSubjectStatusView(v: unknown) {
+  return lexicons.validate(
+    `${id}#subjectStatusView`,
+    v,
+  ) as ValidationResult<SubjectStatusView>
 }
 
 export type SubjectReviewState =
@@ -159,13 +164,13 @@ export type SubjectReviewState =
   | (string & {})
 
 /** Moderator review status of a subject: Open. Indicates that the subject needs to be reviewed by a moderator */
-export const REVIEWOPEN = 'tools.ozone.moderation.defs#reviewOpen'
+export const REVIEWOPEN = `${id}#reviewOpen`
 /** Moderator review status of a subject: Escalated. Indicates that the subject was escalated for review by a moderator */
-export const REVIEWESCALATED = 'tools.ozone.moderation.defs#reviewEscalated'
+export const REVIEWESCALATED = `${id}#reviewEscalated`
 /** Moderator review status of a subject: Closed. Indicates that the subject was already reviewed and resolved by a moderator */
-export const REVIEWCLOSED = 'tools.ozone.moderation.defs#reviewClosed'
+export const REVIEWCLOSED = `${id}#reviewClosed`
 /** Moderator review status of a subject: Unnecessary. Indicates that the subject does not need a review at the moment but there is probably some moderation related metadata available for it */
-export const REVIEWNONE = 'tools.ozone.moderation.defs#reviewNone'
+export const REVIEWNONE = `${id}#reviewNone`
 
 /** Take down a subject permanently or temporarily */
 export interface ModEventTakedown {
@@ -177,16 +182,17 @@ export interface ModEventTakedown {
   [k: string]: unknown
 }
 
-export function isModEventTakedown(v: unknown): v is ModEventTakedown {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventTakedown'
-  )
+export function isModEventTakedown(v: unknown): v is ModEventTakedown & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventTakedown'>
+} {
+  return is$typed(v, id, 'modEventTakedown')
 }
 
-export function validateModEventTakedown(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventTakedown', v)
+export function validateModEventTakedown(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventTakedown`,
+    v,
+  ) as ValidationResult<ModEventTakedown>
 }
 
 /** Revert take down action on a subject */
@@ -198,19 +204,17 @@ export interface ModEventReverseTakedown {
 
 export function isModEventReverseTakedown(
   v: unknown,
-): v is ModEventReverseTakedown {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventReverseTakedown'
-  )
+): v is ModEventReverseTakedown & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventReverseTakedown'>
+} {
+  return is$typed(v, id, 'modEventReverseTakedown')
 }
 
-export function validateModEventReverseTakedown(v: unknown): ValidationResult {
+export function validateModEventReverseTakedown(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventReverseTakedown',
+    `${id}#modEventReverseTakedown`,
     v,
-  )
+  ) as ValidationResult<ModEventReverseTakedown>
 }
 
 /** Resolve appeal on a subject */
@@ -222,19 +226,17 @@ export interface ModEventResolveAppeal {
 
 export function isModEventResolveAppeal(
   v: unknown,
-): v is ModEventResolveAppeal {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventResolveAppeal'
-  )
+): v is ModEventResolveAppeal & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventResolveAppeal'>
+} {
+  return is$typed(v, id, 'modEventResolveAppeal')
 }
 
-export function validateModEventResolveAppeal(v: unknown): ValidationResult {
+export function validateModEventResolveAppeal(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventResolveAppeal',
+    `${id}#modEventResolveAppeal`,
     v,
-  )
+  ) as ValidationResult<ModEventResolveAppeal>
 }
 
 /** Add a comment to a subject */
@@ -245,16 +247,17 @@ export interface ModEventComment {
   [k: string]: unknown
 }
 
-export function isModEventComment(v: unknown): v is ModEventComment {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventComment'
-  )
+export function isModEventComment(v: unknown): v is ModEventComment & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventComment'>
+} {
+  return is$typed(v, id, 'modEventComment')
 }
 
-export function validateModEventComment(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventComment', v)
+export function validateModEventComment(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventComment`,
+    v,
+  ) as ValidationResult<ModEventComment>
 }
 
 /** Report a subject */
@@ -266,16 +269,17 @@ export interface ModEventReport {
   [k: string]: unknown
 }
 
-export function isModEventReport(v: unknown): v is ModEventReport {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventReport'
-  )
+export function isModEventReport(v: unknown): v is ModEventReport & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventReport'>
+} {
+  return is$typed(v, id, 'modEventReport')
 }
 
-export function validateModEventReport(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventReport', v)
+export function validateModEventReport(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventReport`,
+    v,
+  ) as ValidationResult<ModEventReport>
 }
 
 /** Apply/Negate labels on a subject */
@@ -286,16 +290,17 @@ export interface ModEventLabel {
   [k: string]: unknown
 }
 
-export function isModEventLabel(v: unknown): v is ModEventLabel {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventLabel'
-  )
+export function isModEventLabel(v: unknown): v is ModEventLabel & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventLabel'>
+} {
+  return is$typed(v, id, 'modEventLabel')
 }
 
-export function validateModEventLabel(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventLabel', v)
+export function validateModEventLabel(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventLabel`,
+    v,
+  ) as ValidationResult<ModEventLabel>
 }
 
 export interface ModEventAcknowledge {
@@ -305,16 +310,17 @@ export interface ModEventAcknowledge {
   [k: string]: unknown
 }
 
-export function isModEventAcknowledge(v: unknown): v is ModEventAcknowledge {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventAcknowledge'
-  )
+export function isModEventAcknowledge(v: unknown): v is ModEventAcknowledge & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventAcknowledge'>
+} {
+  return is$typed(v, id, 'modEventAcknowledge')
 }
 
-export function validateModEventAcknowledge(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventAcknowledge', v)
+export function validateModEventAcknowledge(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventAcknowledge`,
+    v,
+  ) as ValidationResult<ModEventAcknowledge>
 }
 
 export interface ModEventEscalate {
@@ -322,16 +328,17 @@ export interface ModEventEscalate {
   [k: string]: unknown
 }
 
-export function isModEventEscalate(v: unknown): v is ModEventEscalate {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventEscalate'
-  )
+export function isModEventEscalate(v: unknown): v is ModEventEscalate & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventEscalate'>
+} {
+  return is$typed(v, id, 'modEventEscalate')
 }
 
-export function validateModEventEscalate(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventEscalate', v)
+export function validateModEventEscalate(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventEscalate`,
+    v,
+  ) as ValidationResult<ModEventEscalate>
 }
 
 /** Mute incoming reports on a subject */
@@ -342,16 +349,17 @@ export interface ModEventMute {
   [k: string]: unknown
 }
 
-export function isModEventMute(v: unknown): v is ModEventMute {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventMute'
-  )
+export function isModEventMute(v: unknown): v is ModEventMute & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventMute'>
+} {
+  return is$typed(v, id, 'modEventMute')
 }
 
-export function validateModEventMute(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventMute', v)
+export function validateModEventMute(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventMute`,
+    v,
+  ) as ValidationResult<ModEventMute>
 }
 
 /** Unmute action on a subject */
@@ -361,16 +369,17 @@ export interface ModEventUnmute {
   [k: string]: unknown
 }
 
-export function isModEventUnmute(v: unknown): v is ModEventUnmute {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventUnmute'
-  )
+export function isModEventUnmute(v: unknown): v is ModEventUnmute & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventUnmute'>
+} {
+  return is$typed(v, id, 'modEventUnmute')
 }
 
-export function validateModEventUnmute(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventUnmute', v)
+export function validateModEventUnmute(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventUnmute`,
+    v,
+  ) as ValidationResult<ModEventUnmute>
 }
 
 /** Mute incoming reports from an account */
@@ -381,19 +390,19 @@ export interface ModEventMuteReporter {
   [k: string]: unknown
 }
 
-export function isModEventMuteReporter(v: unknown): v is ModEventMuteReporter {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventMuteReporter'
-  )
+export function isModEventMuteReporter(
+  v: unknown,
+): v is ModEventMuteReporter & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventMuteReporter'>
+} {
+  return is$typed(v, id, 'modEventMuteReporter')
 }
 
-export function validateModEventMuteReporter(v: unknown): ValidationResult {
+export function validateModEventMuteReporter(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventMuteReporter',
+    `${id}#modEventMuteReporter`,
     v,
-  )
+  ) as ValidationResult<ModEventMuteReporter>
 }
 
 /** Unmute incoming reports from an account */
@@ -405,19 +414,17 @@ export interface ModEventUnmuteReporter {
 
 export function isModEventUnmuteReporter(
   v: unknown,
-): v is ModEventUnmuteReporter {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventUnmuteReporter'
-  )
+): v is ModEventUnmuteReporter & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventUnmuteReporter'>
+} {
+  return is$typed(v, id, 'modEventUnmuteReporter')
 }
 
-export function validateModEventUnmuteReporter(v: unknown): ValidationResult {
+export function validateModEventUnmuteReporter(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.moderation.defs#modEventUnmuteReporter',
+    `${id}#modEventUnmuteReporter`,
     v,
-  )
+  ) as ValidationResult<ModEventUnmuteReporter>
 }
 
 /** Keep a log of outgoing email to a user */
@@ -431,16 +438,17 @@ export interface ModEventEmail {
   [k: string]: unknown
 }
 
-export function isModEventEmail(v: unknown): v is ModEventEmail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventEmail'
-  )
+export function isModEventEmail(v: unknown): v is ModEventEmail & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventEmail'>
+} {
+  return is$typed(v, id, 'modEventEmail')
 }
 
-export function validateModEventEmail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventEmail', v)
+export function validateModEventEmail(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventEmail`,
+    v,
+  ) as ValidationResult<ModEventEmail>
 }
 
 /** Divert a record's blobs to a 3rd party service for further scanning/tagging */
@@ -449,16 +457,17 @@ export interface ModEventDivert {
   [k: string]: unknown
 }
 
-export function isModEventDivert(v: unknown): v is ModEventDivert {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventDivert'
-  )
+export function isModEventDivert(v: unknown): v is ModEventDivert & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventDivert'>
+} {
+  return is$typed(v, id, 'modEventDivert')
 }
 
-export function validateModEventDivert(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventDivert', v)
+export function validateModEventDivert(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventDivert`,
+    v,
+  ) as ValidationResult<ModEventDivert>
 }
 
 /** Add/Remove a tag on a subject */
@@ -472,16 +481,17 @@ export interface ModEventTag {
   [k: string]: unknown
 }
 
-export function isModEventTag(v: unknown): v is ModEventTag {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#modEventTag'
-  )
+export function isModEventTag(v: unknown): v is ModEventTag & {
+  $type: $Type<'tools.ozone.moderation.defs', 'modEventTag'>
+} {
+  return is$typed(v, id, 'modEventTag')
 }
 
-export function validateModEventTag(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#modEventTag', v)
+export function validateModEventTag(v: unknown) {
+  return lexicons.validate(
+    `${id}#modEventTag`,
+    v,
+  ) as ValidationResult<ModEventTag>
 }
 
 /** Logs account status related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
@@ -501,16 +511,17 @@ export interface AccountEvent {
   [k: string]: unknown
 }
 
-export function isAccountEvent(v: unknown): v is AccountEvent {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#accountEvent'
-  )
+export function isAccountEvent(v: unknown): v is AccountEvent & {
+  $type: $Type<'tools.ozone.moderation.defs', 'accountEvent'>
+} {
+  return is$typed(v, id, 'accountEvent')
 }
 
-export function validateAccountEvent(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#accountEvent', v)
+export function validateAccountEvent(v: unknown) {
+  return lexicons.validate(
+    `${id}#accountEvent`,
+    v,
+  ) as ValidationResult<AccountEvent>
 }
 
 /** Logs identity related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
@@ -523,16 +534,17 @@ export interface IdentityEvent {
   [k: string]: unknown
 }
 
-export function isIdentityEvent(v: unknown): v is IdentityEvent {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#identityEvent'
-  )
+export function isIdentityEvent(v: unknown): v is IdentityEvent & {
+  $type: $Type<'tools.ozone.moderation.defs', 'identityEvent'>
+} {
+  return is$typed(v, id, 'identityEvent')
 }
 
-export function validateIdentityEvent(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#identityEvent', v)
+export function validateIdentityEvent(v: unknown) {
+  return lexicons.validate(
+    `${id}#identityEvent`,
+    v,
+  ) as ValidationResult<IdentityEvent>
 }
 
 /** Logs lifecycle event on a record subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. */
@@ -544,16 +556,17 @@ export interface RecordEvent {
   [k: string]: unknown
 }
 
-export function isRecordEvent(v: unknown): v is RecordEvent {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordEvent'
-  )
+export function isRecordEvent(v: unknown): v is RecordEvent & {
+  $type: $Type<'tools.ozone.moderation.defs', 'recordEvent'>
+} {
+  return is$typed(v, id, 'recordEvent')
 }
 
-export function validateRecordEvent(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordEvent', v)
+export function validateRecordEvent(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordEvent`,
+    v,
+  ) as ValidationResult<RecordEvent>
 }
 
 export interface RepoView {
@@ -571,16 +584,14 @@ export interface RepoView {
   [k: string]: unknown
 }
 
-export function isRepoView(v: unknown): v is RepoView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#repoView'
-  )
+export function isRepoView(
+  v: unknown,
+): v is RepoView & { $type: $Type<'tools.ozone.moderation.defs', 'repoView'> } {
+  return is$typed(v, id, 'repoView')
 }
 
-export function validateRepoView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#repoView', v)
+export function validateRepoView(v: unknown) {
+  return lexicons.validate(`${id}#repoView`, v) as ValidationResult<RepoView>
 }
 
 export interface RepoViewDetail {
@@ -601,16 +612,17 @@ export interface RepoViewDetail {
   [k: string]: unknown
 }
 
-export function isRepoViewDetail(v: unknown): v is RepoViewDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#repoViewDetail'
-  )
+export function isRepoViewDetail(v: unknown): v is RepoViewDetail & {
+  $type: $Type<'tools.ozone.moderation.defs', 'repoViewDetail'>
+} {
+  return is$typed(v, id, 'repoViewDetail')
 }
 
-export function validateRepoViewDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#repoViewDetail', v)
+export function validateRepoViewDetail(v: unknown) {
+  return lexicons.validate(
+    `${id}#repoViewDetail`,
+    v,
+  ) as ValidationResult<RepoViewDetail>
 }
 
 export interface RepoViewNotFound {
@@ -618,16 +630,17 @@ export interface RepoViewNotFound {
   [k: string]: unknown
 }
 
-export function isRepoViewNotFound(v: unknown): v is RepoViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#repoViewNotFound'
-  )
+export function isRepoViewNotFound(v: unknown): v is RepoViewNotFound & {
+  $type: $Type<'tools.ozone.moderation.defs', 'repoViewNotFound'>
+} {
+  return is$typed(v, id, 'repoViewNotFound')
 }
 
-export function validateRepoViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#repoViewNotFound', v)
+export function validateRepoViewNotFound(v: unknown) {
+  return lexicons.validate(
+    `${id}#repoViewNotFound`,
+    v,
+  ) as ValidationResult<RepoViewNotFound>
 }
 
 export interface RecordView {
@@ -641,16 +654,17 @@ export interface RecordView {
   [k: string]: unknown
 }
 
-export function isRecordView(v: unknown): v is RecordView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordView'
-  )
+export function isRecordView(v: unknown): v is RecordView & {
+  $type: $Type<'tools.ozone.moderation.defs', 'recordView'>
+} {
+  return is$typed(v, id, 'recordView')
 }
 
-export function validateRecordView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordView', v)
+export function validateRecordView(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordView`,
+    v,
+  ) as ValidationResult<RecordView>
 }
 
 export interface RecordViewDetail {
@@ -665,16 +679,17 @@ export interface RecordViewDetail {
   [k: string]: unknown
 }
 
-export function isRecordViewDetail(v: unknown): v is RecordViewDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordViewDetail'
-  )
+export function isRecordViewDetail(v: unknown): v is RecordViewDetail & {
+  $type: $Type<'tools.ozone.moderation.defs', 'recordViewDetail'>
+} {
+  return is$typed(v, id, 'recordViewDetail')
 }
 
-export function validateRecordViewDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordViewDetail', v)
+export function validateRecordViewDetail(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordViewDetail`,
+    v,
+  ) as ValidationResult<RecordViewDetail>
 }
 
 export interface RecordViewNotFound {
@@ -682,16 +697,17 @@ export interface RecordViewNotFound {
   [k: string]: unknown
 }
 
-export function isRecordViewNotFound(v: unknown): v is RecordViewNotFound {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordViewNotFound'
-  )
+export function isRecordViewNotFound(v: unknown): v is RecordViewNotFound & {
+  $type: $Type<'tools.ozone.moderation.defs', 'recordViewNotFound'>
+} {
+  return is$typed(v, id, 'recordViewNotFound')
 }
 
-export function validateRecordViewNotFound(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordViewNotFound', v)
+export function validateRecordViewNotFound(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordViewNotFound`,
+    v,
+  ) as ValidationResult<RecordViewNotFound>
 }
 
 export interface Moderation {
@@ -699,16 +715,17 @@ export interface Moderation {
   [k: string]: unknown
 }
 
-export function isModeration(v: unknown): v is Moderation {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#moderation'
-  )
+export function isModeration(v: unknown): v is Moderation & {
+  $type: $Type<'tools.ozone.moderation.defs', 'moderation'>
+} {
+  return is$typed(v, id, 'moderation')
 }
 
-export function validateModeration(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#moderation', v)
+export function validateModeration(v: unknown) {
+  return lexicons.validate(
+    `${id}#moderation`,
+    v,
+  ) as ValidationResult<Moderation>
 }
 
 export interface ModerationDetail {
@@ -716,16 +733,17 @@ export interface ModerationDetail {
   [k: string]: unknown
 }
 
-export function isModerationDetail(v: unknown): v is ModerationDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#moderationDetail'
-  )
+export function isModerationDetail(v: unknown): v is ModerationDetail & {
+  $type: $Type<'tools.ozone.moderation.defs', 'moderationDetail'>
+} {
+  return is$typed(v, id, 'moderationDetail')
 }
 
-export function validateModerationDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#moderationDetail', v)
+export function validateModerationDetail(v: unknown) {
+  return lexicons.validate(
+    `${id}#moderationDetail`,
+    v,
+  ) as ValidationResult<ModerationDetail>
 }
 
 export interface BlobView {
@@ -741,16 +759,14 @@ export interface BlobView {
   [k: string]: unknown
 }
 
-export function isBlobView(v: unknown): v is BlobView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#blobView'
-  )
+export function isBlobView(
+  v: unknown,
+): v is BlobView & { $type: $Type<'tools.ozone.moderation.defs', 'blobView'> } {
+  return is$typed(v, id, 'blobView')
 }
 
-export function validateBlobView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#blobView', v)
+export function validateBlobView(v: unknown) {
+  return lexicons.validate(`${id}#blobView`, v) as ValidationResult<BlobView>
 }
 
 export interface ImageDetails {
@@ -759,16 +775,17 @@ export interface ImageDetails {
   [k: string]: unknown
 }
 
-export function isImageDetails(v: unknown): v is ImageDetails {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#imageDetails'
-  )
+export function isImageDetails(v: unknown): v is ImageDetails & {
+  $type: $Type<'tools.ozone.moderation.defs', 'imageDetails'>
+} {
+  return is$typed(v, id, 'imageDetails')
 }
 
-export function validateImageDetails(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#imageDetails', v)
+export function validateImageDetails(v: unknown) {
+  return lexicons.validate(
+    `${id}#imageDetails`,
+    v,
+  ) as ValidationResult<ImageDetails>
 }
 
 export interface VideoDetails {
@@ -778,16 +795,17 @@ export interface VideoDetails {
   [k: string]: unknown
 }
 
-export function isVideoDetails(v: unknown): v is VideoDetails {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#videoDetails'
-  )
+export function isVideoDetails(v: unknown): v is VideoDetails & {
+  $type: $Type<'tools.ozone.moderation.defs', 'videoDetails'>
+} {
+  return is$typed(v, id, 'videoDetails')
 }
 
-export function validateVideoDetails(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#videoDetails', v)
+export function validateVideoDetails(v: unknown) {
+  return lexicons.validate(
+    `${id}#videoDetails`,
+    v,
+  ) as ValidationResult<VideoDetails>
 }
 
 export interface AccountHosting {
@@ -806,16 +824,17 @@ export interface AccountHosting {
   [k: string]: unknown
 }
 
-export function isAccountHosting(v: unknown): v is AccountHosting {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#accountHosting'
-  )
+export function isAccountHosting(v: unknown): v is AccountHosting & {
+  $type: $Type<'tools.ozone.moderation.defs', 'accountHosting'>
+} {
+  return is$typed(v, id, 'accountHosting')
 }
 
-export function validateAccountHosting(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#accountHosting', v)
+export function validateAccountHosting(v: unknown) {
+  return lexicons.validate(
+    `${id}#accountHosting`,
+    v,
+  ) as ValidationResult<AccountHosting>
 }
 
 export interface RecordHosting {
@@ -826,14 +845,15 @@ export interface RecordHosting {
   [k: string]: unknown
 }
 
-export function isRecordHosting(v: unknown): v is RecordHosting {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.moderation.defs#recordHosting'
-  )
+export function isRecordHosting(v: unknown): v is RecordHosting & {
+  $type: $Type<'tools.ozone.moderation.defs', 'recordHosting'>
+} {
+  return is$typed(v, id, 'recordHosting')
 }
 
-export function validateRecordHosting(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.moderation.defs#recordHosting', v)
+export function validateRecordHosting(v: unknown) {
+  return lexicons.validate(
+    `${id}#recordHosting`,
+    v,
+  ) as ValidationResult<RecordHosting>
 }
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/emitEvent.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
index 1399cf589ee..80a4fe08d09 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/emitEvent.ts
@@ -3,14 +3,16 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
 
+const id = 'tools.ozone.moderation.emitEvent'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/getEvent.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/getEvent.ts
index b583510a791..1a84e25919e 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/getEvent.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/getEvent.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+const id = 'tools.ozone.moderation.getEvent'
+
 export interface QueryParams {
   id: number
 }
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecord.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecord.ts
index a3832cd161c..6d8e603b879 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecord.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecord.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+const id = 'tools.ozone.moderation.getRecord'
+
 export interface QueryParams {
   uri: string
   cid?: string
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecords.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecords.ts
index 2559727bd65..73a3199fa1f 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecords.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRecords.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+const id = 'tools.ozone.moderation.getRecords'
+
 export interface QueryParams {
   uris: string[]
 }
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepo.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepo.ts
index 853d6460e85..84845fe0772 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepo.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepo.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+const id = 'tools.ozone.moderation.getRepo'
+
 export interface QueryParams {
   did: string
 }
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepos.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepos.ts
index 71da4d1bac9..55245c421d4 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepos.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/getRepos.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+const id = 'tools.ozone.moderation.getRepos'
+
 export interface QueryParams {
   dids: string[]
 }
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/queryEvents.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/queryEvents.ts
index 3dff4ca7cf7..328812e02f6 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/queryEvents.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/queryEvents.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+const id = 'tools.ozone.moderation.queryEvents'
+
 export interface QueryParams {
   /** The types of events (fully qualified string in the format of tools.ozone.moderation.defs#modEvent<name>) to filter by. If not specified, all events are returned. */
   types?: string[]
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
index f1d5bb61690..e730c7cf694 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+const id = 'tools.ozone.moderation.queryStatuses'
+
 export interface QueryParams {
   /** All subjects, or subjects from given 'collections' param, belonging to the account specified in the 'subject' param will be returned. */
   includeAllUserRecords?: boolean
diff --git a/packages/pds/src/lexicon/types/tools/ozone/moderation/searchRepos.ts b/packages/pds/src/lexicon/types/tools/ozone/moderation/searchRepos.ts
index 7696df54d0f..604790371c4 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/moderation/searchRepos.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/moderation/searchRepos.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneModerationDefs from './defs'
 
+const id = 'tools.ozone.moderation.searchRepos'
+
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead */
   term?: string
diff --git a/packages/pds/src/lexicon/types/tools/ozone/server/getConfig.ts b/packages/pds/src/lexicon/types/tools/ozone/server/getConfig.ts
index b05ce4246d9..6f39ec39ccd 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/server/getConfig.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/server/getConfig.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'tools.ozone.server.getConfig'
+
 export interface QueryParams {}
 
 export type InputSchema = undefined
@@ -51,16 +53,17 @@ export interface ServiceConfig {
   [k: string]: unknown
 }
 
-export function isServiceConfig(v: unknown): v is ServiceConfig {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.server.getConfig#serviceConfig'
-  )
+export function isServiceConfig(v: unknown): v is ServiceConfig & {
+  $type: $Type<'tools.ozone.server.getConfig', 'serviceConfig'>
+} {
+  return is$typed(v, id, 'serviceConfig')
 }
 
-export function validateServiceConfig(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.server.getConfig#serviceConfig', v)
+export function validateServiceConfig(v: unknown) {
+  return lexicons.validate(
+    `${id}#serviceConfig`,
+    v,
+  ) as ValidationResult<ServiceConfig>
 }
 
 export interface ViewerConfig {
@@ -72,14 +75,15 @@ export interface ViewerConfig {
   [k: string]: unknown
 }
 
-export function isViewerConfig(v: unknown): v is ViewerConfig {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.server.getConfig#viewerConfig'
-  )
+export function isViewerConfig(v: unknown): v is ViewerConfig & {
+  $type: $Type<'tools.ozone.server.getConfig', 'viewerConfig'>
+} {
+  return is$typed(v, id, 'viewerConfig')
 }
 
-export function validateViewerConfig(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.server.getConfig#viewerConfig', v)
+export function validateViewerConfig(v: unknown) {
+  return lexicons.validate(
+    `${id}#viewerConfig`,
+    v,
+  ) as ValidationResult<ViewerConfig>
 }
diff --git a/packages/pds/src/lexicon/types/tools/ozone/set/addValues.ts b/packages/pds/src/lexicon/types/tools/ozone/set/addValues.ts
index 1a48da4e682..15290b1da5a 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/addValues.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/addValues.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'tools.ozone.set.addValues'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/set/defs.ts b/packages/pds/src/lexicon/types/tools/ozone/set/defs.ts
index 4256bf8a90f..60be9fcb90d 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'tools.ozone.set.defs'
 
 export interface Set {
   name: string
@@ -12,14 +14,14 @@ export interface Set {
   [k: string]: unknown
 }
 
-export function isSet(v: unknown): v is Set {
-  return (
-    isObj(v) && hasProp(v, '$type') && v.$type === 'tools.ozone.set.defs#set'
-  )
+export function isSet(
+  v: unknown,
+): v is Set & { $type: $Type<'tools.ozone.set.defs', 'set'> } {
+  return is$typed(v, id, 'set')
 }
 
-export function validateSet(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.set.defs#set', v)
+export function validateSet(v: unknown) {
+  return lexicons.validate(`${id}#set`, v) as ValidationResult<Set>
 }
 
 export interface SetView {
@@ -31,14 +33,12 @@ export interface SetView {
   [k: string]: unknown
 }
 
-export function isSetView(v: unknown): v is SetView {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.set.defs#setView'
-  )
+export function isSetView(
+  v: unknown,
+): v is SetView & { $type: $Type<'tools.ozone.set.defs', 'setView'> } {
+  return is$typed(v, id, 'setView')
 }
 
-export function validateSetView(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.set.defs#setView', v)
+export function validateSetView(v: unknown) {
+  return lexicons.validate(`${id}#setView`, v) as ValidationResult<SetView>
 }
diff --git a/packages/pds/src/lexicon/types/tools/ozone/set/deleteSet.ts b/packages/pds/src/lexicon/types/tools/ozone/set/deleteSet.ts
index 8b1584c3a1a..997a74925b8 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/deleteSet.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/deleteSet.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'tools.ozone.set.deleteSet'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/set/deleteValues.ts b/packages/pds/src/lexicon/types/tools/ozone/set/deleteValues.ts
index d1090863925..8f9a6bd91e5 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/deleteValues.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/deleteValues.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'tools.ozone.set.deleteValues'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/set/getValues.ts b/packages/pds/src/lexicon/types/tools/ozone/set/getValues.ts
index abae3c0b33a..dca0e183a00 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/getValues.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/getValues.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneSetDefs from './defs'
 
+const id = 'tools.ozone.set.getValues'
+
 export interface QueryParams {
   name: string
   limit: number
diff --git a/packages/pds/src/lexicon/types/tools/ozone/set/querySets.ts b/packages/pds/src/lexicon/types/tools/ozone/set/querySets.ts
index 1eea93a7c4c..34531052800 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/querySets.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/querySets.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneSetDefs from './defs'
 
+const id = 'tools.ozone.set.querySets'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/pds/src/lexicon/types/tools/ozone/set/upsertSet.ts b/packages/pds/src/lexicon/types/tools/ozone/set/upsertSet.ts
index f51e375e425..15af30df6b3 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/set/upsertSet.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/set/upsertSet.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneSetDefs from './defs'
 
+const id = 'tools.ozone.set.upsertSet'
+
 export interface QueryParams {}
 
 export type InputSchema = ToolsOzoneSetDefs.Set
diff --git a/packages/pds/src/lexicon/types/tools/ozone/setting/defs.ts b/packages/pds/src/lexicon/types/tools/ozone/setting/defs.ts
index 8a87cbb0e24..c903a0bf88d 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/setting/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/setting/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'tools.ozone.setting.defs'
 
 export interface Option {
   key: string
@@ -24,14 +26,12 @@ export interface Option {
   [k: string]: unknown
 }
 
-export function isOption(v: unknown): v is Option {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.setting.defs#option'
-  )
+export function isOption(
+  v: unknown,
+): v is Option & { $type: $Type<'tools.ozone.setting.defs', 'option'> } {
+  return is$typed(v, id, 'option')
 }
 
-export function validateOption(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.setting.defs#option', v)
+export function validateOption(v: unknown) {
+  return lexicons.validate(`${id}#option`, v) as ValidationResult<Option>
 }
diff --git a/packages/pds/src/lexicon/types/tools/ozone/setting/listOptions.ts b/packages/pds/src/lexicon/types/tools/ozone/setting/listOptions.ts
index 54ad9608df3..4d18360c027 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/setting/listOptions.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/setting/listOptions.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneSettingDefs from './defs'
 
+const id = 'tools.ozone.setting.listOptions'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/pds/src/lexicon/types/tools/ozone/setting/removeOptions.ts b/packages/pds/src/lexicon/types/tools/ozone/setting/removeOptions.ts
index 1d653b314da..108b8033ae9 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/setting/removeOptions.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/setting/removeOptions.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'tools.ozone.setting.removeOptions'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/setting/upsertOption.ts b/packages/pds/src/lexicon/types/tools/ozone/setting/upsertOption.ts
index b2e66d073d9..f0492775e2a 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/setting/upsertOption.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/setting/upsertOption.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneSettingDefs from './defs'
 
+const id = 'tools.ozone.setting.upsertOption'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/signature/defs.ts b/packages/pds/src/lexicon/types/tools/ozone/signature/defs.ts
index 2c9d9604aaa..0b7bd54997f 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/signature/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/signature/defs.ts
@@ -2,9 +2,11 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
+
+const id = 'tools.ozone.signature.defs'
 
 export interface SigDetail {
   property: string
@@ -12,14 +14,12 @@ export interface SigDetail {
   [k: string]: unknown
 }
 
-export function isSigDetail(v: unknown): v is SigDetail {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.signature.defs#sigDetail'
-  )
+export function isSigDetail(v: unknown): v is SigDetail & {
+  $type: $Type<'tools.ozone.signature.defs', 'sigDetail'>
+} {
+  return is$typed(v, id, 'sigDetail')
 }
 
-export function validateSigDetail(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.signature.defs#sigDetail', v)
+export function validateSigDetail(v: unknown) {
+  return lexicons.validate(`${id}#sigDetail`, v) as ValidationResult<SigDetail>
 }
diff --git a/packages/pds/src/lexicon/types/tools/ozone/signature/findCorrelation.ts b/packages/pds/src/lexicon/types/tools/ozone/signature/findCorrelation.ts
index c3eced05a5e..93070d36f52 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/signature/findCorrelation.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/signature/findCorrelation.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneSignatureDefs from './defs'
 
+const id = 'tools.ozone.signature.findCorrelation'
+
 export interface QueryParams {
   dids: string[]
 }
diff --git a/packages/pds/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts b/packages/pds/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts
index 821d5c6c080..cb00ebb4dae 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/signature/findRelatedAccounts.ts
@@ -3,13 +3,15 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
 import * as ToolsOzoneSignatureDefs from './defs'
 
+const id = 'tools.ozone.signature.findRelatedAccounts'
+
 export interface QueryParams {
   did: string
   cursor?: string
@@ -55,17 +57,15 @@ export interface RelatedAccount {
   [k: string]: unknown
 }
 
-export function isRelatedAccount(v: unknown): v is RelatedAccount {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.signature.findRelatedAccounts#relatedAccount'
-  )
+export function isRelatedAccount(v: unknown): v is RelatedAccount & {
+  $type: $Type<'tools.ozone.signature.findRelatedAccounts', 'relatedAccount'>
+} {
+  return is$typed(v, id, 'relatedAccount')
 }
 
-export function validateRelatedAccount(v: unknown): ValidationResult {
+export function validateRelatedAccount(v: unknown) {
   return lexicons.validate(
-    'tools.ozone.signature.findRelatedAccounts#relatedAccount',
+    `${id}#relatedAccount`,
     v,
-  )
+  ) as ValidationResult<RelatedAccount>
 }
diff --git a/packages/pds/src/lexicon/types/tools/ozone/signature/searchAccounts.ts b/packages/pds/src/lexicon/types/tools/ozone/signature/searchAccounts.ts
index 4e37745aa4a..7b1484c8619 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/signature/searchAccounts.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/signature/searchAccounts.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
 
+const id = 'tools.ozone.signature.searchAccounts'
+
 export interface QueryParams {
   values: string[]
   cursor?: string
diff --git a/packages/pds/src/lexicon/types/tools/ozone/team/addMember.ts b/packages/pds/src/lexicon/types/tools/ozone/team/addMember.ts
index 85e40f2a461..288313038be 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/team/addMember.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/team/addMember.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneTeamDefs from './defs'
 
+const id = 'tools.ozone.team.addMember'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/team/defs.ts b/packages/pds/src/lexicon/types/tools/ozone/team/defs.ts
index b670ecc0a70..d6e51429c77 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/team/defs.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/team/defs.ts
@@ -2,11 +2,13 @@
  * GENERATED CODE - DO NOT MODIFY
  */
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import * as AppBskyActorDefs from '../../../app/bsky/actor/defs'
 
+const id = 'tools.ozone.team.defs'
+
 export interface Member {
   did: string
   disabled?: boolean
@@ -22,21 +24,19 @@ export interface Member {
   [k: string]: unknown
 }
 
-export function isMember(v: unknown): v is Member {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'tools.ozone.team.defs#member'
-  )
+export function isMember(
+  v: unknown,
+): v is Member & { $type: $Type<'tools.ozone.team.defs', 'member'> } {
+  return is$typed(v, id, 'member')
 }
 
-export function validateMember(v: unknown): ValidationResult {
-  return lexicons.validate('tools.ozone.team.defs#member', v)
+export function validateMember(v: unknown) {
+  return lexicons.validate(`${id}#member`, v) as ValidationResult<Member>
 }
 
 /** Admin role. Highest level of access, can perform all actions. */
-export const ROLEADMIN = 'tools.ozone.team.defs#roleAdmin'
+export const ROLEADMIN = `${id}#roleAdmin`
 /** Moderator role. Can perform most actions. */
-export const ROLEMODERATOR = 'tools.ozone.team.defs#roleModerator'
+export const ROLEMODERATOR = `${id}#roleModerator`
 /** Triage role. Mostly intended for monitoring and escalating issues. */
-export const ROLETRIAGE = 'tools.ozone.team.defs#roleTriage'
+export const ROLETRIAGE = `${id}#roleTriage`
diff --git a/packages/pds/src/lexicon/types/tools/ozone/team/deleteMember.ts b/packages/pds/src/lexicon/types/tools/ozone/team/deleteMember.ts
index 3adf03313dc..b6f0c8c2997 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/team/deleteMember.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/team/deleteMember.ts
@@ -3,11 +3,13 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
+const id = 'tools.ozone.team.deleteMember'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/types/tools/ozone/team/listMembers.ts b/packages/pds/src/lexicon/types/tools/ozone/team/listMembers.ts
index 1995cc68cc1..9dffdbad5ce 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/team/listMembers.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/team/listMembers.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneTeamDefs from './defs'
 
+const id = 'tools.ozone.team.listMembers'
+
 export interface QueryParams {
   limit: number
   cursor?: string
diff --git a/packages/pds/src/lexicon/types/tools/ozone/team/updateMember.ts b/packages/pds/src/lexicon/types/tools/ozone/team/updateMember.ts
index 57b0a318583..d770b8fafb3 100644
--- a/packages/pds/src/lexicon/types/tools/ozone/team/updateMember.ts
+++ b/packages/pds/src/lexicon/types/tools/ozone/team/updateMember.ts
@@ -3,12 +3,14 @@
  */
 import express from 'express'
 import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
+import { lexicons } from '../../../../lexicons'
+import { $Type, is$typed } from '../../../../util'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ToolsOzoneTeamDefs from './defs'
 
+const id = 'tools.ozone.team.updateMember'
+
 export interface QueryParams {}
 
 export interface InputSchema {
diff --git a/packages/pds/src/lexicon/util.ts b/packages/pds/src/lexicon/util.ts
index d7e70440d6e..a8b8cc9e0b7 100644
--- a/packages/pds/src/lexicon/util.ts
+++ b/packages/pds/src/lexicon/util.ts
@@ -1,13 +1,39 @@
 /**
  * GENERATED CODE - DO NOT MODIFY
  */
-export function isObj(v: unknown): v is Record<string, unknown> {
-  return typeof v === 'object' && v !== null
+export type $Typed<V> = V & { $type: string }
+
+export type $Type<Id extends string, Hash extends string> = Hash extends 'main'
+  ? Id | `${Id}#${Hash}`
+  : `${Id}#${Hash}`
+
+function has$type<V>(v: V): v is $Typed<V & object> {
+  return (
+    v != null &&
+    typeof v === 'object' &&
+    '$type' in v &&
+    typeof v.$type === 'string'
+  )
+}
+
+function check$type<Id extends string, Hash extends string>(
+  $type: string,
+  id: Id,
+  hash: Hash,
+): $type is $Type<Id, Hash> {
+  return $type === id
+    ? hash === 'main'
+    : // $type === `${id}#${hash}`
+      $type.length === id.length + 1 + hash.length &&
+        $type.charCodeAt(id.length) === 35 /* '#' */ &&
+        $type.startsWith(id) &&
+        $type.endsWith(hash)
 }
 
-export function hasProp<K extends PropertyKey>(
-  data: object,
-  prop: K,
-): data is Record<K, unknown> {
-  return prop in data
+export function is$typed<V, Id extends string, Hash extends string>(
+  v: V,
+  id: Id,
+  hash: Hash,
+): v is V & object & { $type: $Type<Id, Hash> } {
+  return has$type(v) && check$type(v.$type, id, hash)
 }