diff --git a/apps/web/actions/caps/share.ts b/apps/web/actions/caps/share.ts
index de025712d1..707e0e4d65 100644
--- a/apps/web/actions/caps/share.ts
+++ b/apps/web/actions/caps/share.ts
@@ -11,13 +11,13 @@ import {
 	spaceVideos,
 	videos,
 } from "@cap/database/schema";
-import type { Video } from "@cap/web-domain";
+import type { Organisation, Space, Video } from "@cap/web-domain";
 import { and, eq, inArray } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 
 interface ShareCapParams {
 	capId: Video.VideoId;
-	spaceIds: string[];
+	spaceIds: Space.SpaceIdOrOrganisationId[];
 	public?: boolean;
 }
 
@@ -53,7 +53,7 @@ export async function shareCap({
 			.from(organizations)
 			.where(
 				and(
-					inArray(organizations.id, spaceIds),
+					inArray(organizations.id, spaceIds as Organisation.OrganisationId[]),
 					inArray(organizations.id, userOrganizationIds),
 				),
 			)
diff --git a/apps/web/actions/organization/check-domain.ts b/apps/web/actions/organization/check-domain.ts
index 93a57282c7..c7041c6439 100644
--- a/apps/web/actions/organization/check-domain.ts
+++ b/apps/web/actions/organization/check-domain.ts
@@ -3,10 +3,13 @@
 import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
 import { organizations } from "@cap/database/schema";
+import type { Organisation } from "@cap/web-domain";
 import { eq } from "drizzle-orm";
 import { checkDomainStatus } from "./domain-utils";
 
-export async function checkOrganizationDomain(organizationId: string) {
+export async function checkOrganizationDomain(
+	organizationId: Organisation.OrganisationId,
+) {
 	const user = await getCurrentUser();
 
 	if (!user || !organizationId) {
diff --git a/apps/web/actions/organization/create-space.ts b/apps/web/actions/organization/create-space.ts
index 552344f1a4..d50b193484 100644
--- a/apps/web/actions/organization/create-space.ts
+++ b/apps/web/actions/organization/create-space.ts
@@ -6,6 +6,7 @@ import { nanoId, nanoIdLength } from "@cap/database/helpers";
 import { spaceMembers, spaces, users } from "@cap/database/schema";
 import { serverEnv } from "@cap/env";
 import { S3Buckets } from "@cap/web-backend";
+import { Space } from "@cap/web-domain";
 import { and, eq, inArray } from "drizzle-orm";
 import { Effect, Option } from "effect";
 import { revalidatePath } from "next/cache";
@@ -62,7 +63,7 @@ export async function createSpace(
 		}
 
 		// Generate the space ID early so we can use it in the file path
-		const spaceId = nanoId();
+		const spaceId = Space.SpaceId.make(nanoId());
 
 		const iconFile = formData.get("icon") as File | null;
 		let iconUrl = null;
diff --git a/apps/web/actions/organization/delete-space.ts b/apps/web/actions/organization/delete-space.ts
index 066222621b..406474c888 100644
--- a/apps/web/actions/organization/delete-space.ts
+++ b/apps/web/actions/organization/delete-space.ts
@@ -9,6 +9,7 @@ import {
 	spaceVideos,
 } from "@cap/database/schema";
 import { S3Buckets } from "@cap/web-backend";
+import type { Space } from "@cap/web-domain";
 import { eq } from "drizzle-orm";
 import { Effect, Option } from "effect";
 import { revalidatePath } from "next/cache";
@@ -20,7 +21,7 @@ interface DeleteSpaceResponse {
 }
 
 export async function deleteSpace(
-	spaceId: string,
+	spaceId: Space.SpaceIdOrOrganisationId,
 ): Promise<DeleteSpaceResponse> {
 	try {
 		const user = await getCurrentUser();
diff --git a/apps/web/actions/organization/get-organization-sso-data.ts b/apps/web/actions/organization/get-organization-sso-data.ts
index 2340d86077..00b42981bf 100644
--- a/apps/web/actions/organization/get-organization-sso-data.ts
+++ b/apps/web/actions/organization/get-organization-sso-data.ts
@@ -2,9 +2,12 @@
 
 import { db } from "@cap/database";
 import { organizations } from "@cap/database/schema";
+import type { Organisation } from "@cap/web-domain";
 import { eq } from "drizzle-orm";
 
-export async function getOrganizationSSOData(organizationId: string) {
+export async function getOrganizationSSOData(
+	organizationId: Organisation.OrganisationId,
+) {
 	if (!organizationId) {
 		throw new Error("Organization ID is required");
 	}
diff --git a/apps/web/actions/organization/remove-domain.ts b/apps/web/actions/organization/remove-domain.ts
index 9085875431..1f4cdd97a3 100644
--- a/apps/web/actions/organization/remove-domain.ts
+++ b/apps/web/actions/organization/remove-domain.ts
@@ -3,10 +3,13 @@
 import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
 import { organizations } from "@cap/database/schema";
+import type { Organisation } from "@cap/web-domain";
 import { eq } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 
-export async function removeOrganizationDomain(organizationId: string) {
+export async function removeOrganizationDomain(
+	organizationId: Organisation.OrganisationId,
+) {
 	const user = await getCurrentUser();
 
 	if (!user) {
diff --git a/apps/web/actions/organization/remove-icon.ts b/apps/web/actions/organization/remove-icon.ts
index 7efa19fb2e..6eba5818ce 100644
--- a/apps/web/actions/organization/remove-icon.ts
+++ b/apps/web/actions/organization/remove-icon.ts
@@ -3,10 +3,13 @@
 import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
 import { organizations } from "@cap/database/schema";
+import type { Organisation } from "@cap/web-domain";
 import { eq } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 
-export async function removeOrganizationIcon(organizationId: string) {
+export async function removeOrganizationIcon(
+	organizationId: Organisation.OrganisationId,
+) {
 	const user = await getCurrentUser();
 
 	if (!user) {
diff --git a/apps/web/actions/organization/remove-invite.ts b/apps/web/actions/organization/remove-invite.ts
index 4e06234f18..a9039cdcab 100644
--- a/apps/web/actions/organization/remove-invite.ts
+++ b/apps/web/actions/organization/remove-invite.ts
@@ -3,12 +3,13 @@
 import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
 import { organizationInvites, organizations } from "@cap/database/schema";
+import type { Organisation } from "@cap/web-domain";
 import { and, eq } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 
 export async function removeOrganizationInvite(
 	inviteId: string,
-	organizationId: string,
+	organizationId: Organisation.OrganisationId,
 ) {
 	const user = await getCurrentUser();
 
diff --git a/apps/web/actions/organization/remove-member.ts b/apps/web/actions/organization/remove-member.ts
index 82e3a097c3..f7cfc6a134 100644
--- a/apps/web/actions/organization/remove-member.ts
+++ b/apps/web/actions/organization/remove-member.ts
@@ -3,6 +3,7 @@
 import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
 import { organizationMembers, organizations } from "@cap/database/schema";
+import type { Organisation } from "@cap/web-domain";
 import { and, eq } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 
@@ -13,7 +14,7 @@ import { revalidatePath } from "next/cache";
  */
 export async function removeOrganizationMember(
 	memberId: string,
-	organizationId: string,
+	organizationId: Organisation.OrganisationId,
 ) {
 	const user = await getCurrentUser();
 	if (!user) throw new Error("Unauthorized");
diff --git a/apps/web/actions/organization/send-invites.ts b/apps/web/actions/organization/send-invites.ts
index 3532fde120..183a115b24 100644
--- a/apps/web/actions/organization/send-invites.ts
+++ b/apps/web/actions/organization/send-invites.ts
@@ -7,12 +7,13 @@ import { OrganizationInvite } from "@cap/database/emails/organization-invite";
 import { nanoId } from "@cap/database/helpers";
 import { organizationInvites, organizations } from "@cap/database/schema";
 import { serverEnv } from "@cap/env";
+import type { Organisation } from "@cap/web-domain";
 import { eq } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 
 export async function sendOrganizationInvites(
 	invitedEmails: string[],
-	organizationId: string,
+	organizationId: Organisation.OrganisationId,
 ) {
 	const user = await getCurrentUser();
 
diff --git a/apps/web/actions/organization/update-details.ts b/apps/web/actions/organization/update-details.ts
index 0422708057..0156e2654c 100644
--- a/apps/web/actions/organization/update-details.ts
+++ b/apps/web/actions/organization/update-details.ts
@@ -3,6 +3,7 @@
 import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
 import { organizations } from "@cap/database/schema";
+import type { Organisation } from "@cap/web-domain";
 import { eq } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 
@@ -13,7 +14,7 @@ export async function updateOrganizationDetails({
 }: {
 	organizationName?: string | null;
 	allowedEmailDomain?: string | null;
-	organizationId: string;
+	organizationId: Organisation.OrganisationId;
 }) {
 	const user = await getCurrentUser();
 
diff --git a/apps/web/actions/organization/update-domain.ts b/apps/web/actions/organization/update-domain.ts
index dd109e7f13..20c9d2914e 100644
--- a/apps/web/actions/organization/update-domain.ts
+++ b/apps/web/actions/organization/update-domain.ts
@@ -3,11 +3,15 @@
 import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
 import { organizations } from "@cap/database/schema";
+import type { Organisation } from "@cap/web-domain";
 import { eq } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 import { addDomain, checkDomainStatus } from "./domain-utils";
 
-export async function updateDomain(domain: string, organizationId: string) {
+export async function updateDomain(
+	domain: string,
+	organizationId: Organisation.OrganisationId,
+) {
 	const user = await getCurrentUser();
 
 	if (!user) {
diff --git a/apps/web/actions/organization/update-space.ts b/apps/web/actions/organization/update-space.ts
index ab6237d0bd..0fe9743873 100644
--- a/apps/web/actions/organization/update-space.ts
+++ b/apps/web/actions/organization/update-space.ts
@@ -5,6 +5,7 @@ import { getCurrentUser } from "@cap/database/auth/session";
 import { nanoIdLength } from "@cap/database/helpers";
 import { spaceMembers, spaces } from "@cap/database/schema";
 import { S3Buckets } from "@cap/web-backend";
+import { Space, type User } from "@cap/web-domain";
 import { and, eq } from "drizzle-orm";
 import { Effect, Option } from "effect";
 import { revalidatePath } from "next/cache";
@@ -16,9 +17,9 @@ export async function updateSpace(formData: FormData) {
 	const user = await getCurrentUser();
 	if (!user) return { success: false, error: "Unauthorized" };
 
-	const id = formData.get("id") as string;
+	const id = Space.SpaceId.make(formData.get("id") as string);
 	const name = formData.get("name") as string;
-	const members = formData.getAll("members[]") as string[];
+	const members = formData.getAll("members[]") as User.UserId[];
 	const iconFile = formData.get("icon") as File | null;
 
 	const [membership] = await db()
diff --git a/apps/web/actions/organization/upload-organization-icon.ts b/apps/web/actions/organization/upload-organization-icon.ts
index 485418da7c..3ab5989009 100644
--- a/apps/web/actions/organization/upload-organization-icon.ts
+++ b/apps/web/actions/organization/upload-organization-icon.ts
@@ -5,6 +5,7 @@ import { getCurrentUser } from "@cap/database/auth/session";
 import { organizations } from "@cap/database/schema";
 import { serverEnv } from "@cap/env";
 import { S3Buckets } from "@cap/web-backend";
+import type { Organisation } from "@cap/web-domain";
 import DOMPurify from "dompurify";
 import { eq } from "drizzle-orm";
 import { Effect, Option } from "effect";
@@ -15,7 +16,7 @@ import { runPromise } from "@/lib/server";
 
 export async function uploadOrganizationIcon(
 	formData: FormData,
-	organizationId: string,
+	organizationId: Organisation.OrganisationId,
 ) {
 	const user = await getCurrentUser();
 
diff --git a/apps/web/actions/organization/upload-space-icon.ts b/apps/web/actions/organization/upload-space-icon.ts
index e56c92b5a6..395d668026 100644
--- a/apps/web/actions/organization/upload-space-icon.ts
+++ b/apps/web/actions/organization/upload-space-icon.ts
@@ -5,13 +5,17 @@ import { getCurrentUser } from "@cap/database/auth/session";
 import { spaces } from "@cap/database/schema";
 import { serverEnv } from "@cap/env";
 import { S3Buckets } from "@cap/web-backend";
+import type { Space } from "@cap/web-domain";
 import { eq } from "drizzle-orm";
 import { Effect, Option } from "effect";
 import { revalidatePath } from "next/cache";
 import { sanitizeFile } from "@/lib/sanitizeFile";
 import { runPromise } from "@/lib/server";
 
-export async function uploadSpaceIcon(formData: FormData, spaceId: string) {
+export async function uploadSpaceIcon(
+	formData: FormData,
+	spaceId: Space.SpaceId,
+) {
 	const user = await getCurrentUser();
 
 	if (!user) {
diff --git a/apps/web/actions/organizations/add-videos.ts b/apps/web/actions/organizations/add-videos.ts
index 3571238088..97c24fc84e 100644
--- a/apps/web/actions/organizations/add-videos.ts
+++ b/apps/web/actions/organizations/add-videos.ts
@@ -9,12 +9,12 @@ import {
 	sharedVideos,
 	videos,
 } from "@cap/database/schema";
-import type { Video } from "@cap/web-domain";
+import type { Organisation, Video } from "@cap/web-domain";
 import { and, eq, inArray } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 
 export async function addVideosToOrganization(
-	organizationId: string,
+	organizationId: Organisation.OrganisationId,
 	videoIds: Video.VideoId[],
 ) {
 	try {
diff --git a/apps/web/actions/organizations/get-organization-videos.ts b/apps/web/actions/organizations/get-organization-videos.ts
index 1b847fa1d4..41431c3af1 100644
--- a/apps/web/actions/organizations/get-organization-videos.ts
+++ b/apps/web/actions/organizations/get-organization-videos.ts
@@ -3,9 +3,12 @@
 import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
 import { sharedVideos } from "@cap/database/schema";
+import type { Organisation } from "@cap/web-domain";
 import { eq } from "drizzle-orm";
 
-export async function getOrganizationVideoIds(organizationId: string) {
+export async function getOrganizationVideoIds(
+	organizationId: Organisation.OrganisationId,
+) {
 	try {
 		const user = await getCurrentUser();
 
diff --git a/apps/web/actions/organizations/remove-videos.ts b/apps/web/actions/organizations/remove-videos.ts
index 307384fc39..0275857232 100644
--- a/apps/web/actions/organizations/remove-videos.ts
+++ b/apps/web/actions/organizations/remove-videos.ts
@@ -9,12 +9,12 @@ import {
 	sharedVideos,
 	videos,
 } from "@cap/database/schema";
-import type { Video } from "@cap/web-domain";
+import type { Organisation, Video } from "@cap/web-domain";
 import { and, eq, inArray } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 
 export async function removeVideosFromOrganization(
-	organizationId: string,
+	organizationId: Organisation.OrganisationId,
 	videoIds: Video.VideoId[],
 ) {
 	try {
diff --git a/apps/web/actions/spaces/add-videos.ts b/apps/web/actions/spaces/add-videos.ts
index 0e5e77aec5..bbb5656816 100644
--- a/apps/web/actions/spaces/add-videos.ts
+++ b/apps/web/actions/spaces/add-videos.ts
@@ -4,12 +4,12 @@ import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
 import { nanoId } from "@cap/database/helpers";
 import { spaces, spaceVideos, videos } from "@cap/database/schema";
-import type { Video } from "@cap/web-domain";
+import type { Space, Video } from "@cap/web-domain";
 import { and, eq, inArray } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 
 export async function addVideosToSpace(
-	spaceId: string,
+	spaceId: Space.SpaceIdOrOrganisationId,
 	videoIds: Video.VideoId[],
 ) {
 	try {
diff --git a/apps/web/actions/spaces/get-space-videos.ts b/apps/web/actions/spaces/get-space-videos.ts
index be72f9c5bb..7ebf0d61fe 100644
--- a/apps/web/actions/spaces/get-space-videos.ts
+++ b/apps/web/actions/spaces/get-space-videos.ts
@@ -3,9 +3,10 @@
 import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
 import { spaceVideos } from "@cap/database/schema";
+import type { Space } from "@cap/web-domain";
 import { eq } from "drizzle-orm";
 
-export async function getSpaceVideoIds(spaceId: string) {
+export async function getSpaceVideoIds(spaceId: Space.SpaceIdOrOrganisationId) {
 	try {
 		const user = await getCurrentUser();
 
diff --git a/apps/web/actions/spaces/remove-videos.ts b/apps/web/actions/spaces/remove-videos.ts
index 0f252bfc9d..dcf39fb264 100644
--- a/apps/web/actions/spaces/remove-videos.ts
+++ b/apps/web/actions/spaces/remove-videos.ts
@@ -3,12 +3,12 @@
 import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
 import { folders, spaceVideos, videos } from "@cap/database/schema";
-import type { Video } from "@cap/web-domain";
+import type { Space, Video } from "@cap/web-domain";
 import { and, eq, inArray } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 
 export async function removeVideosFromSpace(
-	spaceId: string,
+	spaceId: Space.SpaceIdOrOrganisationId,
 	videoIds: Video.VideoId[],
 ) {
 	try {
diff --git a/apps/web/actions/video/upload.ts b/apps/web/actions/video/upload.ts
index 87a3481b65..c2482120dd 100644
--- a/apps/web/actions/video/upload.ts
+++ b/apps/web/actions/video/upload.ts
@@ -11,7 +11,7 @@ import { s3Buckets, videos, videoUploads } from "@cap/database/schema";
 import { buildEnv, NODE_ENV, serverEnv } from "@cap/env";
 import { userIsPro } from "@cap/utils";
 import { S3Buckets } from "@cap/web-backend";
-import { type Folder, Video } from "@cap/web-domain";
+import { type Folder, type Organisation, Video } from "@cap/web-domain";
 import { eq } from "drizzle-orm";
 import { Effect, Option } from "effect";
 import { revalidatePath } from "next/cache";
@@ -175,7 +175,7 @@ export async function createVideoAndGetUploadUrl({
 	isScreenshot?: boolean;
 	isUpload?: boolean;
 	folderId?: Folder.FolderId;
-	orgId: string;
+	orgId: Organisation.OrganisationId;
 	// TODO: Remove this once we are happy with it's stability
 	supportsUploadProgress?: boolean;
 }) {
diff --git a/apps/web/actions/videos/delete-comment.ts b/apps/web/actions/videos/delete-comment.ts
index 1cfb069321..8451ecc178 100644
--- a/apps/web/actions/videos/delete-comment.ts
+++ b/apps/web/actions/videos/delete-comment.ts
@@ -3,6 +3,7 @@
 import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
 import { comments, notifications } from "@cap/database/schema";
+import type { Comment, Video } from "@cap/web-domain";
 import { and, eq, sql } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 
@@ -11,9 +12,9 @@ export async function deleteComment({
 	parentId,
 	videoId,
 }: {
-	commentId: string;
-	parentId?: string;
-	videoId: string;
+	commentId: Comment.CommentId;
+	parentId?: Comment.CommentId;
+	videoId: Video.VideoId;
 }) {
 	const user = await getCurrentUser();
 
diff --git a/apps/web/actions/videos/new-comment.ts b/apps/web/actions/videos/new-comment.ts
index 85a4466f7b..f12729c3dd 100644
--- a/apps/web/actions/videos/new-comment.ts
+++ b/apps/web/actions/videos/new-comment.ts
@@ -4,7 +4,7 @@ import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
 import { nanoId } from "@cap/database/helpers";
 import { comments } from "@cap/database/schema";
-import type { Video } from "@cap/web-domain";
+import { Comment, type Video } from "@cap/web-domain";
 import { revalidatePath } from "next/cache";
 import { createNotification } from "@/lib/Notification";
 
@@ -12,7 +12,7 @@ export async function newComment(data: {
 	content: string;
 	videoId: Video.VideoId;
 	type: "text" | "emoji";
-	parentCommentId: string;
+	parentCommentId: Comment.CommentId;
 	timestamp: number;
 }) {
 	const user = await getCurrentUser();
@@ -35,7 +35,7 @@ export async function newComment(data: {
 	if (!content || !videoId) {
 		throw new Error("Content and videoId are required");
 	}
-	const id = nanoId();
+	const id = Comment.CommentId.make(nanoId());
 
 	const newComment = {
 		id: id,
diff --git a/apps/web/app/(org)/dashboard/_components/Navbar/SpacesList.tsx b/apps/web/app/(org)/dashboard/_components/Navbar/SpacesList.tsx
index ad77e09ce7..69bd0541d1 100644
--- a/apps/web/app/(org)/dashboard/_components/Navbar/SpacesList.tsx
+++ b/apps/web/app/(org)/dashboard/_components/Navbar/SpacesList.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { Avatar, Button } from "@cap/ui";
+import type { Space } from "@cap/web-domain";
 import {
 	faLayerGroup,
 	faPlus,
@@ -91,7 +92,10 @@ const SpacesList = ({ toggleMobileNav }: { toggleMobileNav?: () => void }) => {
 		setActiveDropTarget(null);
 	};
 
-	const handleDrop = async (e: React.DragEvent, spaceId: string) => {
+	const handleDrop = async (
+		e: React.DragEvent,
+		spaceId: Space.SpaceIdOrOrganisationId,
+	) => {
 		e.preventDefault();
 		setActiveDropTarget(null);
 
@@ -120,7 +124,8 @@ const SpacesList = ({ toggleMobileNav }: { toggleMobileNav?: () => void }) => {
 		}
 	};
 
-	const activeSpaceParams = (spaceId: string) => params.spaceId === spaceId;
+	const activeSpaceParams = (spaceId: Space.SpaceIdOrOrganisationId) =>
+		params.spaceId === spaceId;
 
 	return (
 		<div className="flex flex-col mt-4">
diff --git a/apps/web/app/(org)/dashboard/_components/Navbar/server.ts b/apps/web/app/(org)/dashboard/_components/Navbar/server.ts
index 419eb5e8c5..83109fd149 100644
--- a/apps/web/app/(org)/dashboard/_components/Navbar/server.ts
+++ b/apps/web/app/(org)/dashboard/_components/Navbar/server.ts
@@ -7,12 +7,15 @@ import {
 	organizations,
 	users,
 } from "@cap/database/schema";
+import type { Organisation } from "@cap/web-domain";
 import { and, eq } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 import { createSpace as createSpaceAction } from "@/actions/organization/create-space";
 import { updateSpace as updateSpaceAction } from "@/actions/organization/update-space";
 
-export async function updateActiveOrganization(organizationId: string) {
+export async function updateActiveOrganization(
+	organizationId: Organisation.OrganisationId,
+) {
 	const user = await getCurrentUser();
 	if (!user) throw new Error("Unauthorized");
 
diff --git a/apps/web/app/(org)/dashboard/caps/components/NewFolderDialog.tsx b/apps/web/app/(org)/dashboard/caps/components/NewFolderDialog.tsx
index ef7dfe3c60..6565de9b7b 100644
--- a/apps/web/app/(org)/dashboard/caps/components/NewFolderDialog.tsx
+++ b/apps/web/app/(org)/dashboard/caps/components/NewFolderDialog.tsx
@@ -9,7 +9,7 @@ import {
 	DialogTitle,
 	Input,
 } from "@cap/ui";
-import type { Folder } from "@cap/web-domain";
+import type { Folder, Space } from "@cap/web-domain";
 import { faFolderPlus } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { type RiveFile, useRiveFile } from "@rive-app/react-canvas";
@@ -31,7 +31,7 @@ import {
 interface Props {
 	open: boolean;
 	onOpenChange: (open: boolean) => void;
-	spaceId?: string;
+	spaceId?: Space.SpaceIdOrOrganisationId;
 }
 
 const FolderOptions = [
diff --git a/apps/web/app/(org)/dashboard/caps/components/SharingDialog.tsx b/apps/web/app/(org)/dashboard/caps/components/SharingDialog.tsx
index 4eb32644f4..b3d7c0ca57 100644
--- a/apps/web/app/(org)/dashboard/caps/components/SharingDialog.tsx
+++ b/apps/web/app/(org)/dashboard/caps/components/SharingDialog.tsx
@@ -9,7 +9,7 @@ import {
 	Input,
 	Switch,
 } from "@cap/ui";
-import type { Video } from "@cap/web-domain";
+import { Space, type Video } from "@cap/web-domain";
 import { faCopy, faShareNodes } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useMutation } from "@tanstack/react-query";
@@ -69,7 +69,7 @@ export const SharingDialog: React.FC<SharingDialogProps> = ({
 			public: isPublic,
 		}: {
 			capId: Video.VideoId;
-			spaceIds: string[];
+			spaceIds: Space.SpaceIdOrOrganisationId[];
 			public: boolean;
 		}) => {
 			const result = await shareCap({ capId, spaceIds, public: isPublic });
@@ -358,7 +358,9 @@ export const SharingDialog: React.FC<SharingDialogProps> = ({
 								onClick={() =>
 									updateSharing.mutate({
 										capId,
-										spaceIds: Array.from(selectedSpaces),
+										spaceIds: Array.from(selectedSpaces).map((v) =>
+											Space.SpaceId.make(v),
+										),
 										public: publicToggle,
 									})
 								}
diff --git a/apps/web/app/(org)/dashboard/caps/components/UploadCapButton.tsx b/apps/web/app/(org)/dashboard/caps/components/UploadCapButton.tsx
index 085d0dfb96..638f546520 100644
--- a/apps/web/app/(org)/dashboard/caps/components/UploadCapButton.tsx
+++ b/apps/web/app/(org)/dashboard/caps/components/UploadCapButton.tsx
@@ -2,7 +2,7 @@
 
 import { Button } from "@cap/ui";
 import { userIsPro } from "@cap/utils";
-import type { Folder } from "@cap/web-domain";
+import type { Folder, Organisation } from "@cap/web-domain";
 import { faUpload } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { type QueryClient, useQueryClient } from "@tanstack/react-query";
@@ -100,7 +100,7 @@ export const UploadCapButton = ({
 async function legacyUploadCap(
 	file: File,
 	folderId: Folder.FolderId | undefined,
-	orgId: string,
+	orgId: Organisation.OrganisationId,
 	setUploadStatus: (state: UploadStatus | undefined) => void,
 	queryClient: QueryClient,
 ) {
diff --git a/apps/web/app/(org)/dashboard/settings/account/Settings.tsx b/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
index 384c78438b..6c8dc3ade8 100644
--- a/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
+++ b/apps/web/app/(org)/dashboard/settings/account/Settings.tsx
@@ -9,6 +9,7 @@ import {
 	Input,
 	Select,
 } from "@cap/ui";
+import { Organisation } from "@cap/web-domain";
 import { useMutation } from "@tanstack/react-query";
 import { useRouter } from "next/navigation";
 import { useEffect, useState } from "react";
@@ -25,9 +26,9 @@ export const Settings = ({
 	const { organizationData } = useDashboardContext();
 	const [firstName, setFirstName] = useState(user?.name || "");
 	const [lastName, setLastName] = useState(user?.lastName || "");
-	const [defaultOrgId, setDefaultOrgId] = useState<string | undefined>(
-		user?.defaultOrgId || undefined,
-	);
+	const [defaultOrgId, setDefaultOrgId] = useState<
+		Organisation.OrganisationId | undefined
+	>(user?.defaultOrgId || undefined);
 
 	// Track if form has unsaved changes
 	const hasChanges =
@@ -131,7 +132,9 @@ export const Settings = ({
 							organizationData?.[0]?.organization.id ??
 							""
 						}
-						onValueChange={(value) => setDefaultOrgId(value)}
+						onValueChange={(value) =>
+							setDefaultOrgId(Organisation.OrganisationId.make(value))
+						}
 						options={(organizationData || []).map((org) => ({
 							value: org.organization.id,
 							label: org.organization.name,
diff --git a/apps/web/app/(org)/dashboard/settings/account/server.ts b/apps/web/app/(org)/dashboard/settings/account/server.ts
index b0a8bceaee..9f47b8a7a0 100644
--- a/apps/web/app/(org)/dashboard/settings/account/server.ts
+++ b/apps/web/app/(org)/dashboard/settings/account/server.ts
@@ -7,13 +7,14 @@ import {
 	organizations,
 	users,
 } from "@cap/database/schema";
+import type { Organisation } from "@cap/web-domain";
 import { eq, or } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 
 export async function patchAccountSettings(
 	firstName?: string,
 	lastName?: string,
-	defaultOrgId?: string,
+	defaultOrgId?: Organisation.OrganisationId,
 ) {
 	const currentUser = await getCurrentUser();
 	if (!currentUser) throw new Error("Unauthorized");
@@ -21,7 +22,7 @@ export async function patchAccountSettings(
 	const updatePayload: Partial<{
 		name: string;
 		lastName: string;
-		defaultOrgId: string;
+		defaultOrgId: Organisation.OrganisationId;
 	}> = {};
 
 	if (firstName !== undefined) updatePayload.name = firstName;
diff --git a/apps/web/app/(org)/dashboard/settings/organization/components/AccessEmailDomain.tsx b/apps/web/app/(org)/dashboard/settings/organization/components/AccessEmailDomain.tsx
index b00c3ecd96..725c3cddf6 100644
--- a/apps/web/app/(org)/dashboard/settings/organization/components/AccessEmailDomain.tsx
+++ b/apps/web/app/(org)/dashboard/settings/organization/components/AccessEmailDomain.tsx
@@ -1,4 +1,5 @@
 import { Button, Input, Label } from "@cap/ui";
+import type { Organisation } from "@cap/web-domain";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
 import { toast } from "sonner";
@@ -18,7 +19,8 @@ export const AccessEmailDomain = () => {
 			setSaveLoading(true);
 			await updateOrganizationDetails({
 				allowedEmailDomain: emailDomain,
-				organizationId: activeOrganization?.organization.id as string,
+				organizationId: activeOrganization?.organization
+					.id as Organisation.OrganisationId,
 			});
 			toast.success("Settings updated successfully");
 			router.refresh();
diff --git a/apps/web/app/(org)/dashboard/settings/organization/components/CustomDomain.tsx b/apps/web/app/(org)/dashboard/settings/organization/components/CustomDomain.tsx
index f3737fcd5f..a2d9a784ac 100644
--- a/apps/web/app/(org)/dashboard/settings/organization/components/CustomDomain.tsx
+++ b/apps/web/app/(org)/dashboard/settings/organization/components/CustomDomain.tsx
@@ -1,4 +1,5 @@
 import { Button } from "@cap/ui";
+import { Organisation } from "@cap/web-domain";
 import {
 	faCheckCircle,
 	faExclamationCircle,
@@ -32,7 +33,9 @@ export function CustomDomain() {
 
 	const removeDomainMutation = useMutation({
 		mutationFn: (organizationId: string) =>
-			removeOrganizationDomain(organizationId),
+			removeOrganizationDomain(
+				Organisation.OrganisationId.make(organizationId),
+			),
 		onSuccess: () => {
 			setIsVerified(false);
 			toast.success("Custom domain removed");
diff --git a/apps/web/app/(org)/dashboard/settings/organization/components/CustomDomainDialog/CustomDomainDialog.tsx b/apps/web/app/(org)/dashboard/settings/organization/components/CustomDomainDialog/CustomDomainDialog.tsx
index 0df988ad91..3bb58a5457 100644
--- a/apps/web/app/(org)/dashboard/settings/organization/components/CustomDomainDialog/CustomDomainDialog.tsx
+++ b/apps/web/app/(org)/dashboard/settings/organization/components/CustomDomainDialog/CustomDomainDialog.tsx
@@ -6,6 +6,7 @@ import {
 	DialogHeader,
 	DialogTitle,
 } from "@cap/ui";
+import { Organisation } from "@cap/web-domain";
 import { faGlobe, faRefresh } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useMutation } from "@tanstack/react-query";
@@ -20,7 +21,6 @@ import { Confetti } from "@/app/(org)/dashboard/_components/Confetti";
 import { useDashboardContext } from "../../../../Contexts";
 import DomainStep from "./DomainStep";
 import { Stepper } from "./Stepper";
-
 import SubscribeContent from "./SubscribeContent";
 import SuccesStep from "./SuccessStep";
 import {
@@ -151,9 +151,12 @@ const CustomDomainDialog = ({
 			orgId: string;
 		}) => {
 			if (activeOrganization?.organization.customDomain) {
-				await removeOrganizationDomain(orgId);
+				await removeOrganizationDomain(Organisation.OrganisationId.make(orgId));
 			}
-			return await updateDomain(domain, orgId);
+			return await updateDomain(
+				domain,
+				Organisation.OrganisationId.make(orgId),
+			);
 		},
 		onSuccess: (data) => {
 			handleNext();
@@ -181,7 +184,12 @@ const CustomDomainDialog = ({
 			orgId: string;
 			showToasts: boolean;
 		}) => {
-			return { data: await checkOrganizationDomain(orgId), showToasts };
+			return {
+				data: await checkOrganizationDomain(
+					Organisation.OrganisationId.make(orgId),
+				),
+				showToasts,
+			};
 		},
 		onSuccess: ({ data, showToasts }) => {
 			setIsVerified(data.verified);
diff --git a/apps/web/app/(org)/dashboard/settings/organization/components/InviteDialog.tsx b/apps/web/app/(org)/dashboard/settings/organization/components/InviteDialog.tsx
index 6f53c2309b..0f966e472c 100644
--- a/apps/web/app/(org)/dashboard/settings/organization/components/InviteDialog.tsx
+++ b/apps/web/app/(org)/dashboard/settings/organization/components/InviteDialog.tsx
@@ -9,6 +9,7 @@ import {
 	DialogTitle,
 	Input,
 } from "@cap/ui";
+import type { Organisation } from "@cap/web-domain";
 import { faUserGroup } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useMutation } from "@tanstack/react-query";
@@ -95,7 +96,7 @@ export const InviteDialog = ({
 
 			return await sendOrganizationInvites(
 				inviteEmails,
-				activeOrganization?.organization.id as string,
+				activeOrganization?.organization.id as Organisation.OrganisationId,
 			);
 		},
 		onSuccess: () => {
diff --git a/apps/web/app/(org)/dashboard/settings/organization/components/MembersCard.tsx b/apps/web/app/(org)/dashboard/settings/organization/components/MembersCard.tsx
index 3359170943..7d9b0f8924 100644
--- a/apps/web/app/(org)/dashboard/settings/organization/components/MembersCard.tsx
+++ b/apps/web/app/(org)/dashboard/settings/organization/components/MembersCard.tsx
@@ -54,7 +54,7 @@ export const MembersCard = ({
 		try {
 			await removeOrganizationInvite(
 				inviteId,
-				activeOrganization?.organization.id as string,
+				activeOrganization!.organization.id,
 			);
 			toast.success("Invite deleted successfully");
 			router.refresh();
@@ -90,7 +90,7 @@ export const MembersCard = ({
 		try {
 			await removeOrganizationMember(
 				pendingMember.id,
-				activeOrganization?.organization.id as string,
+				activeOrganization!.organization.id,
 			);
 			toast.success("Member removed successfully");
 			setConfirmOpen(false);
@@ -126,7 +126,7 @@ export const MembersCard = ({
 				title="Remove member"
 				description={
 					pendingMemberTest
-						? `Are you sure you want to remove ${pendingMemberTest.name} 
+						? `Are you sure you want to remove ${pendingMemberTest.name}
          from your organization? this action cannot be undone.`
 						: ""
 				}
diff --git a/apps/web/app/(org)/dashboard/settings/organization/components/OrgName.tsx b/apps/web/app/(org)/dashboard/settings/organization/components/OrgName.tsx
index 952afff150..5917c18212 100644
--- a/apps/web/app/(org)/dashboard/settings/organization/components/OrgName.tsx
+++ b/apps/web/app/(org)/dashboard/settings/organization/components/OrgName.tsx
@@ -19,7 +19,7 @@ const OrgName = () => {
 			setSaveLoading(true);
 			await updateOrganizationDetails({
 				organizationName: orgName,
-				organizationId: activeOrganization?.organization.id as string,
+				organizationId: activeOrganization!.organization.id,
 			});
 			toast.success("Settings updated successfully");
 			router.refresh();
diff --git a/apps/web/app/(org)/dashboard/spaces/[spaceId]/SharedCaps.tsx b/apps/web/app/(org)/dashboard/spaces/[spaceId]/SharedCaps.tsx
index 7201e4572a..cf0b63387f 100644
--- a/apps/web/app/(org)/dashboard/spaces/[spaceId]/SharedCaps.tsx
+++ b/apps/web/app/(org)/dashboard/spaces/[spaceId]/SharedCaps.tsx
@@ -2,7 +2,7 @@
 
 import type { VideoMetadata } from "@cap/database/types";
 import { Button } from "@cap/ui";
-import type { Video } from "@cap/web-domain";
+import type { Organisation, Space, User, Video } from "@cap/web-domain";
 import { faFolderPlus, faInfoCircle } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useQuery } from "@tanstack/react-query";
@@ -36,10 +36,10 @@ type SharedVideoData = {
 }[];
 
 type SpaceData = {
-	id: string;
+	id: Space.SpaceIdOrOrganisationId;
 	name: string;
-	organizationId: string;
-	createdById: string;
+	organizationId: Organisation.OrganisationId;
+	createdById: User.UserId;
 };
 
 export const SharedCaps = ({
@@ -60,12 +60,12 @@ export const SharedCaps = ({
 	hideSharedWith?: boolean;
 	spaceMembers?: SpaceMemberData[];
 	organizationMembers?: OrganizationMemberData[];
-	currentUserId?: string;
+	currentUserId?: User.UserId;
 	folders?: FolderDataType[];
 	organizationData?: {
-		id: string;
+		id: Organisation.OrganisationId;
 		name: string;
-		ownerId: string;
+		ownerId: User.UserId;
 	};
 }) => {
 	const params = useSearchParams();
diff --git a/apps/web/app/(org)/dashboard/spaces/[spaceId]/actions.ts b/apps/web/app/(org)/dashboard/spaces/[spaceId]/actions.ts
index e641b35217..847ef9dc40 100644
--- a/apps/web/app/(org)/dashboard/spaces/[spaceId]/actions.ts
+++ b/apps/web/app/(org)/dashboard/spaces/[spaceId]/actions.ts
@@ -4,6 +4,7 @@ import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
 import { nanoIdLength } from "@cap/database/helpers";
 import { spaceMembers } from "@cap/database/schema";
+import { Space, User } from "@cap/web-domain";
 import { eq, inArray } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 import { v4 as uuidv4 } from "uuid";
@@ -12,14 +13,14 @@ import { z } from "zod";
 const spaceRole = z.union([z.literal("Admin"), z.literal("member")]);
 
 const addSpaceMemberSchema = z.object({
-	spaceId: z.string(),
-	userId: z.string(),
+	spaceId: z.string().transform((v) => Space.SpaceId.make(v)),
+	userId: z.string().transform((v) => User.UserId.make(v)),
 	role: spaceRole,
 });
 
 const addSpaceMembersSchema = z.object({
-	spaceId: z.string(),
-	userIds: z.array(z.string()),
+	spaceId: z.string().transform((v) => Space.SpaceId.make(v)),
+	userIds: z.array(z.string().transform((v) => User.UserId.make(v))),
 	role: spaceRole,
 });
 
@@ -149,8 +150,10 @@ export async function removeSpaceMember(
 
 // Replace all members for a space
 const setSpaceMembersSchema = z.object({
-	spaceId: z.string(),
-	userIds: z.array(z.string()),
+	spaceId: z
+		.string()
+		.transform((v) => Space.SpaceId.make(v) as Space.SpaceIdOrOrganisationId),
+	userIds: z.array(z.string().transform((v) => User.UserId.make(v))),
 	role: spaceRole.default("member"),
 });
 
@@ -174,7 +177,7 @@ export async function setSpaceMembers(
 	if (userIds.length > 0) {
 		const now = new Date();
 		const values = userIds.map((userId) => ({
-			id: uuidv4().substring(0, nanoIdLength),
+			id: User.UserId.make(uuidv4().substring(0, nanoIdLength)),
 			spaceId,
 			userId,
 			role,
diff --git a/apps/web/app/(org)/dashboard/spaces/[spaceId]/components/AddVideosDialog.tsx b/apps/web/app/(org)/dashboard/spaces/[spaceId]/components/AddVideosDialog.tsx
index efb3bc9439..305acfc0b8 100644
--- a/apps/web/app/(org)/dashboard/spaces/[spaceId]/components/AddVideosDialog.tsx
+++ b/apps/web/app/(org)/dashboard/spaces/[spaceId]/components/AddVideosDialog.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import type { Space } from "@cap/web-domain";
 import type React from "react";
 import { addVideosToSpace } from "@/actions/spaces/add-videos";
 import { getSpaceVideoIds } from "@/actions/spaces/get-space-videos";
@@ -10,7 +11,7 @@ import AddVideosDialogBase from "./AddVideosDialogBase";
 interface AddVideosDialogProps {
 	open: boolean;
 	onClose: () => void;
-	spaceId: string;
+	spaceId: Space.SpaceIdOrOrganisationId;
 	spaceName: string;
 	onVideosAdded?: () => void;
 }
diff --git a/apps/web/app/(org)/dashboard/spaces/[spaceId]/components/AddVideosDialogBase.tsx b/apps/web/app/(org)/dashboard/spaces/[spaceId]/components/AddVideosDialogBase.tsx
index cb3d7a0134..3ec721dab6 100644
--- a/apps/web/app/(org)/dashboard/spaces/[spaceId]/components/AddVideosDialogBase.tsx
+++ b/apps/web/app/(org)/dashboard/spaces/[spaceId]/components/AddVideosDialogBase.tsx
@@ -23,16 +23,16 @@ import { toast } from "sonner";
 import * as z from "zod";
 import VirtualizedVideoGrid from "./VirtualizedVideoGrid";
 
-interface AddVideosDialogBaseProps {
+interface AddVideosDialogBaseProp<T> {
 	open: boolean;
 	onClose: () => void;
-	entityId: string;
+	entityId: T;
 	entityName: string;
 	onVideosAdded?: () => void;
-	addVideos: (entityId: string, videoIds: Video.VideoId[]) => Promise<any>;
-	removeVideos: (entityId: string, videoIds: Video.VideoId[]) => Promise<any>;
+	addVideos: (entityId: T, videoIds: Video.VideoId[]) => Promise<any>;
+	removeVideos: (entityId: T, videoIds: Video.VideoId[]) => Promise<any>;
 	getVideos: (limit?: number) => Promise<any>;
-	getEntityVideoIds: (entityId: string) => Promise<any>;
+	getEntityVideoIds: (entityId: T) => Promise<any>;
 }
 
 export interface VideoData {
@@ -52,7 +52,7 @@ const formSchema = z.object({
 	search: z.string(),
 });
 
-const AddVideosDialogBase: React.FC<AddVideosDialogBaseProps> = ({
+function AddVideosDialogBase<T>({
 	open,
 	onClose,
 	entityId,
@@ -62,7 +62,7 @@ const AddVideosDialogBase: React.FC<AddVideosDialogBaseProps> = ({
 	removeVideos,
 	getVideos,
 	getEntityVideoIds,
-}) => {
+}: AddVideosDialogBaseProp<T>) {
 	const [selectedVideos, setSelectedVideos] = useState<Video.VideoId[]>([]);
 	const [searchTerm, setSearchTerm] = useState("");
 	const filterTabs = ["all", "added", "notAdded"];
@@ -334,6 +334,6 @@ const AddVideosDialogBase: React.FC<AddVideosDialogBaseProps> = ({
 			</DialogContent>
 		</Dialog>
 	);
-};
+}
 
 export default AddVideosDialogBase;
diff --git a/apps/web/app/(org)/dashboard/spaces/[spaceId]/components/AddVideosToOrganizationDialog.tsx b/apps/web/app/(org)/dashboard/spaces/[spaceId]/components/AddVideosToOrganizationDialog.tsx
index 3bbf5312ce..bd5ece90c0 100644
--- a/apps/web/app/(org)/dashboard/spaces/[spaceId]/components/AddVideosToOrganizationDialog.tsx
+++ b/apps/web/app/(org)/dashboard/spaces/[spaceId]/components/AddVideosToOrganizationDialog.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import type { Organisation } from "@cap/web-domain";
 import type React from "react";
 import { addVideosToOrganization } from "@/actions/organizations/add-videos";
 import { getOrganizationVideoIds } from "@/actions/organizations/get-organization-videos";
@@ -10,7 +11,7 @@ import AddVideosDialogBase from "./AddVideosDialogBase";
 interface AddVideosToOrganizationDialogProps {
 	open: boolean;
 	onClose: () => void;
-	organizationId: string;
+	organizationId: Organisation.OrganisationId;
 	organizationName: string;
 	onVideosAdded?: () => void;
 }
diff --git a/apps/web/app/(org)/dashboard/spaces/[spaceId]/components/MembersIndicator.tsx b/apps/web/app/(org)/dashboard/spaces/[spaceId]/components/MembersIndicator.tsx
index d4bf09afff..f5681a20cc 100644
--- a/apps/web/app/(org)/dashboard/spaces/[spaceId]/components/MembersIndicator.tsx
+++ b/apps/web/app/(org)/dashboard/spaces/[spaceId]/components/MembersIndicator.tsx
@@ -13,6 +13,7 @@ import {
 	FormControl,
 	FormField,
 } from "@cap/ui";
+import { type Space, User } from "@cap/web-domain";
 import { faPlus, faUserGroup } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { zodResolver } from "@hookform/resolvers/zod";
@@ -30,7 +31,7 @@ type MembersIndicatorProps = {
 	memberCount: number;
 	members: SpaceMemberData[];
 	organizationMembers: SpaceMemberData[];
-	spaceId: string;
+	spaceId: Space.SpaceIdOrOrganisationId;
 	canManageMembers: boolean;
 	onAddVideos?: () => void;
 };
@@ -58,7 +59,7 @@ export const MembersIndicator = ({
 		},
 	});
 
-	const handleSaveMembers = async (selectedUserIds: string[]) => {
+	const handleSaveMembers = async (selectedUserIds: User.UserId[]) => {
 		if (!canManageMembers) return;
 
 		// Compare selectedUserIds to current members' userIds (order-insensitive)
@@ -196,7 +197,11 @@ export const MembersIndicator = ({
 						{canManageMembers && (
 							<Button
 								onClick={() =>
-									handleSaveMembers(form.getValues("members") ?? [])
+									handleSaveMembers(
+										form
+											.getValues("members")
+											?.map((v) => User.UserId.make(v)) ?? [],
+									)
 								}
 								disabled={isLoading}
 								spinner={isLoading}
diff --git a/apps/web/app/(org)/dashboard/spaces/[spaceId]/folder/[folderId]/page.tsx b/apps/web/app/(org)/dashboard/spaces/[spaceId]/folder/[folderId]/page.tsx
index bb013899c6..4af71d3a4e 100644
--- a/apps/web/app/(org)/dashboard/spaces/[spaceId]/folder/[folderId]/page.tsx
+++ b/apps/web/app/(org)/dashboard/spaces/[spaceId]/folder/[folderId]/page.tsx
@@ -1,7 +1,7 @@
 import { getCurrentUser } from "@cap/database/auth/session";
 import { serverEnv } from "@cap/env";
 import { Spaces } from "@cap/web-backend";
-import { CurrentUser, type Folder } from "@cap/web-domain";
+import { CurrentUser, type Folder, Space } from "@cap/web-domain";
 import { Effect } from "effect";
 import { notFound } from "next/navigation";
 import FolderCard from "@/app/(org)/dashboard/caps/components/Folder";
@@ -27,7 +27,9 @@ const FolderPage = async (props: {
 
 	return await Effect.gen(function* () {
 		const spaces = yield* Spaces;
-		const spaceOrOrg = yield* spaces.getSpaceOrOrg(params.spaceId);
+		const spaceOrOrg = yield* spaces.getSpaceOrOrg(
+			Space.SpaceId.make(params.spaceId),
+		);
 		if (!spaceOrOrg) notFound();
 
 		const [childFolders, breadcrumb, videosData] = yield* Effect.all([
diff --git a/apps/web/app/(org)/dashboard/spaces/[spaceId]/page.tsx b/apps/web/app/(org)/dashboard/spaces/[spaceId]/page.tsx
index f35a74fa9e..7f5d110074 100644
--- a/apps/web/app/(org)/dashboard/spaces/[spaceId]/page.tsx
+++ b/apps/web/app/(org)/dashboard/spaces/[spaceId]/page.tsx
@@ -13,7 +13,7 @@ import {
 } from "@cap/database/schema";
 import { serverEnv } from "@cap/env";
 import { Spaces } from "@cap/web-backend";
-import { CurrentUser, Video } from "@cap/web-domain";
+import { CurrentUser, type Organisation, Space, Video } from "@cap/web-domain";
 import { and, count, desc, eq, isNull, sql } from "drizzle-orm";
 import { Effect } from "effect";
 import type { Metadata } from "next";
@@ -35,7 +35,7 @@ export type SpaceMemberData = {
 };
 
 // --- Helper functions ---
-async function fetchFolders(spaceId: string) {
+async function fetchFolders(spaceId: Space.SpaceIdOrOrganisationId) {
 	return db()
 		.select({
 			id: folders.id,
@@ -51,7 +51,7 @@ async function fetchFolders(spaceId: string) {
 		.where(and(eq(folders.spaceId, spaceId), isNull(folders.parentId)));
 }
 
-async function fetchSpaceMembers(spaceId: string) {
+async function fetchSpaceMembers(spaceId: Space.SpaceIdOrOrganisationId) {
 	return db()
 		.select({
 			id: spaceMembers.id,
@@ -66,7 +66,7 @@ async function fetchSpaceMembers(spaceId: string) {
 		.where(eq(spaceMembers.spaceId, spaceId));
 }
 
-async function fetchOrganizationMembers(orgId: string) {
+async function fetchOrganizationMembers(orgId: Organisation.OrganisationId) {
 	return db()
 		.select({
 			id: organizationMembers.id,
@@ -93,7 +93,7 @@ export default async function SharedCapsPage(props: {
 	if (!user) notFound();
 
 	const spaceOrOrg = await Effect.flatMap(Spaces, (s) =>
-		s.getSpaceOrOrg(params.spaceId),
+		s.getSpaceOrOrg(Space.SpaceId.make(params.spaceId)),
 	).pipe(
 		Effect.catchTag("PolicyDenied", () => Effect.sync(() => notFound())),
 		Effect.provideService(CurrentUser, user),
@@ -114,7 +114,7 @@ export default async function SharedCapsPage(props: {
 			]);
 
 		async function fetchSpaceVideos(
-			spaceId: string,
+			spaceId: Space.SpaceIdOrOrganisationId,
 			page: number,
 			limit: number,
 		) {
@@ -208,7 +208,7 @@ export default async function SharedCapsPage(props: {
 		const { organization } = spaceOrOrg;
 
 		async function fetchOrganizationVideos(
-			orgId: string,
+			orgId: Organisation.OrganisationId,
 			page: number,
 			limit: number,
 		) {
diff --git a/apps/web/app/(org)/login/form.tsx b/apps/web/app/(org)/login/form.tsx
index db2a2ab97b..d3ee8fb358 100644
--- a/apps/web/app/(org)/login/form.tsx
+++ b/apps/web/app/(org)/login/form.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { Button, Input, LogoBadge } from "@cap/ui";
+import { Organisation } from "@cap/web-domain";
 import {
 	faArrowLeft,
 	faEnvelope,
@@ -117,7 +118,9 @@ export function LoginForm() {
 		}
 
 		try {
-			const data = await getOrganizationSSOData(organizationId);
+			const data = await getOrganizationSSOData(
+				Organisation.OrganisationId.make(organizationId),
+			);
 			setOrganizationName(data.name);
 
 			signIn("workos", undefined, {
diff --git a/apps/web/app/(org)/signup/form.tsx b/apps/web/app/(org)/signup/form.tsx
index d5817ac073..d6e1f035cd 100644
--- a/apps/web/app/(org)/signup/form.tsx
+++ b/apps/web/app/(org)/signup/form.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { Button, Input, LogoBadge } from "@cap/ui";
+import { Organisation } from "@cap/web-domain";
 import {
 	faArrowLeft,
 	faEnvelope,
@@ -117,7 +118,9 @@ export function SignupForm() {
 		}
 
 		try {
-			const data = await getOrganizationSSOData(organizationId);
+			const data = await getOrganizationSSOData(
+				Organisation.OrganisationId.make(organizationId),
+			);
 			setOrganizationName(data.name);
 
 			signIn("workos", undefined, {
diff --git a/apps/web/app/api/desktop/[...route]/video.ts b/apps/web/app/api/desktop/[...route]/video.ts
index 3f4d7d22b9..eea0b2f7e5 100644
--- a/apps/web/app/api/desktop/[...route]/video.ts
+++ b/apps/web/app/api/desktop/[...route]/video.ts
@@ -13,9 +13,9 @@ import {
 import { buildEnv, NODE_ENV, serverEnv } from "@cap/env";
 import { userIsPro } from "@cap/utils";
 import { S3Buckets } from "@cap/web-backend";
-import { Video } from "@cap/web-domain";
+import { Organisation, Video } from "@cap/web-domain";
 import { zValidator } from "@hono/zod-validator";
-import { and, count, eq, gt, gte, lt, lte, or } from "drizzle-orm";
+import { and, count, eq, lte, or } from "drizzle-orm";
 import { Effect, Option } from "effect";
 import { Hono } from "hono";
 import { z } from "zod";
@@ -41,7 +41,12 @@ app.get(
 			width: stringOrNumberOptional,
 			height: stringOrNumberOptional,
 			fps: stringOrNumberOptional,
-			orgId: z.string().optional(),
+			orgId: z
+				.string()
+				.optional()
+				.transform((v) =>
+					v ? Organisation.OrganisationId.make(v) : undefined,
+				),
 		}),
 	),
 	async (c) => {
@@ -125,7 +130,7 @@ app.get(
 				.orderBy(organizations.createdAt);
 			const userOrgIds = userOrganizations.map((org) => org.id);
 
-			let videoOrgId: string;
+			let videoOrgId: Organisation.OrganisationId;
 			if (orgId) {
 				// Hard error if the user requested org is non-existent or they don't have access.
 				if (!userOrgIds.includes(orgId))
diff --git a/apps/web/app/api/settings/onboarding/route.ts b/apps/web/app/api/settings/onboarding/route.ts
index 5036599a3d..3720d242b2 100644
--- a/apps/web/app/api/settings/onboarding/route.ts
+++ b/apps/web/app/api/settings/onboarding/route.ts
@@ -6,6 +6,7 @@ import {
 	organizations,
 	users,
 } from "@cap/database/schema";
+import { Organisation } from "@cap/web-domain";
 import { and, eq, ne, or } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 import type { NextRequest } from "next/server";
@@ -64,7 +65,7 @@ export async function POST(request: NextRequest) {
 		);
 
 	if (!organization) {
-		const organizationId = nanoId();
+		const organizationId = Organisation.OrganisationId.make(nanoId());
 
 		await db()
 			.insert(organizations)
diff --git a/apps/web/app/api/upload/[...route]/multipart.ts b/apps/web/app/api/upload/[...route]/multipart.ts
index 5d1217c8e0..a5ad8c0d19 100644
--- a/apps/web/app/api/upload/[...route]/multipart.ts
+++ b/apps/web/app/api/upload/[...route]/multipart.ts
@@ -319,7 +319,7 @@ app.post(
 						if (result.rowsAffected > 0)
 							await db()
 								.delete(videoUploads)
-								.where(eq(videoUploads.videoId, videoId));
+								.where(eq(videoUploads.videoId, Video.VideoId.make(videoId)));
 					}
 
 					if (videoIdFromFileKey) {
diff --git a/apps/web/app/api/video/comment/delete/route.ts b/apps/web/app/api/video/comment/delete/route.ts
index edc10839a1..1e6a12db99 100644
--- a/apps/web/app/api/video/comment/delete/route.ts
+++ b/apps/web/app/api/video/comment/delete/route.ts
@@ -1,17 +1,21 @@
 import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
 import { comments } from "@cap/database/schema";
+import { Comment } from "@cap/web-domain";
 import { and, eq, or } from "drizzle-orm";
+import { Option } from "effect";
 import type { NextRequest } from "next/server";
 import { getHeaders } from "@/utils/helpers";
 
 export async function DELETE(request: NextRequest) {
 	const user = await getCurrentUser();
 	const { searchParams } = request.nextUrl;
-	const commentId = searchParams.get("commentId");
-	const origin = request.headers.get("origin") as string;
+	const commentId = Option.fromNullable(searchParams.get("commentId")).pipe(
+		Option.map(Comment.CommentId.make),
+	);
+	const origin = request.headers.get("origin");
 
-	if (!commentId || !user?.id) {
+	if (!Option.isSome(commentId) || !user?.id) {
 		return new Response(JSON.stringify({ error: "Missing required data" }), {
 			status: 400,
 			headers: getHeaders(origin),
@@ -23,7 +27,9 @@ export async function DELETE(request: NextRequest) {
 		const query = await db()
 			.select()
 			.from(comments)
-			.where(and(eq(comments.id, commentId), eq(comments.authorId, user.id)));
+			.where(
+				and(eq(comments.id, commentId.value), eq(comments.authorId, user.id)),
+			);
 
 		if (query.length === 0) {
 			return new Response(
@@ -39,7 +45,10 @@ export async function DELETE(request: NextRequest) {
 		await db()
 			.delete(comments)
 			.where(
-				or(eq(comments.id, commentId), eq(comments.parentCommentId, commentId)),
+				or(
+					eq(comments.id, commentId.value),
+					eq(comments.parentCommentId, commentId.value),
+				),
 			);
 
 		return new Response(JSON.stringify({ success: true }), {
diff --git a/apps/web/app/api/video/comment/route.ts b/apps/web/app/api/video/comment/route.ts
index 211dfa2d1a..f150dc7815 100644
--- a/apps/web/app/api/video/comment/route.ts
+++ b/apps/web/app/api/video/comment/route.ts
@@ -3,6 +3,7 @@ import { getCurrentUser } from "@cap/database/auth/session";
 import { nanoId } from "@cap/database/helpers";
 import { comments } from "@cap/database/schema";
 import { serverEnv } from "@cap/env";
+import { Comment, User, Video } from "@cap/web-domain";
 import { headers } from "next/headers";
 import type { NextRequest } from "next/server";
 import { rateLimitMiddleware } from "@/utils/helpers";
@@ -12,9 +13,9 @@ async function handlePost(request: NextRequest) {
 	const { type, content, videoId, timestamp, parentCommentId } =
 		await request.json();
 
-	const userId = user?.id || "anonymous";
+	const userId = user?.id || User.UserId.make("anonymous");
 	const parentCommentIdSanitized = parentCommentId
-		? parentCommentId.replace("temp-", "")
+		? Comment.CommentId.make(parentCommentId.replace("temp-", ""))
 		: null;
 
 	if (!type || !content || !videoId) {
@@ -29,7 +30,7 @@ async function handlePost(request: NextRequest) {
 		);
 	}
 
-	const id = nanoId();
+	const id = Comment.CommentId.make(nanoId());
 
 	try {
 		const newComment = {
@@ -37,7 +38,7 @@ async function handlePost(request: NextRequest) {
 			authorId: userId,
 			type: type,
 			content: content,
-			videoId: videoId,
+			videoId: Video.VideoId.make(videoId),
 			timestamp: timestamp || null,
 			parentCommentId: parentCommentIdSanitized || null,
 			createdAt: new Date(),
diff --git a/apps/web/app/api/webhooks/stripe/route.ts b/apps/web/app/api/webhooks/stripe/route.ts
index 9b31984865..63e8887ba6 100644
--- a/apps/web/app/api/webhooks/stripe/route.ts
+++ b/apps/web/app/api/webhooks/stripe/route.ts
@@ -3,6 +3,7 @@ import { nanoId } from "@cap/database/helpers";
 import { users } from "@cap/database/schema";
 import { buildEnv, serverEnv } from "@cap/env";
 import { stripe } from "@cap/utils";
+import { Organisation, User } from "@cap/web-domain";
 import { eq } from "drizzle-orm";
 import { NextResponse } from "next/server";
 import { PostHog } from "posthog-node";
@@ -17,16 +18,18 @@ const relevantEvents = new Set([
 async function createGuestUser(
 	email: string,
 ): Promise<typeof users.$inferSelect> {
-	const userId = nanoId();
-
-	await db().insert(users).values({
-		id: userId,
-		email: email,
-		emailVerified: null,
-		name: null,
-		image: null,
-		activeOrganizationId: "",
-	});
+	const userId = User.UserId.make(nanoId());
+
+	await db()
+		.insert(users)
+		.values({
+			id: userId,
+			email: email,
+			emailVerified: null,
+			name: null,
+			image: null,
+			activeOrganizationId: Organisation.OrganisationId.make(""),
+		});
 
 	const result = await db()
 		.select()
@@ -44,7 +47,7 @@ async function createGuestUser(
 
 async function findUserWithRetry(
 	email: string,
-	userId?: string,
+	userId?: User.UserId,
 	maxRetries = 5,
 ): Promise<typeof users.$inferSelect | null> {
 	for (let i = 0; i < maxRetries; i++) {
@@ -150,11 +153,13 @@ export const POST = async (req: Request) => {
 					metadata: "metadata" in customer ? customer.metadata : undefined,
 				});
 
-				let foundUserId: string | undefined;
+				let foundUserId: User.UserId | undefined;
 				let customerEmail: string | null | undefined;
 
 				if ("metadata" in customer) {
-					foundUserId = customer.metadata.userId;
+					foundUserId = customer.metadata.userId
+						? User.UserId.make(customer.metadata.userId)
+						: undefined;
 				}
 				if ("email" in customer) {
 					customerEmail = customer.email;
@@ -302,11 +307,13 @@ export const POST = async (req: Request) => {
 					metadata: "metadata" in customer ? customer.metadata : undefined,
 				});
 
-				let foundUserId: string | undefined;
+				let foundUserId: User.UserId | undefined;
 				let customerEmail: string | null | undefined;
 
 				if ("metadata" in customer) {
-					foundUserId = customer.metadata.userId;
+					foundUserId = customer.metadata.userId
+						? User.UserId.make(customer.metadata.userId)
+						: undefined;
 				}
 				if ("email" in customer) {
 					customerEmail = customer.email;
@@ -384,9 +391,11 @@ export const POST = async (req: Request) => {
 				const customer = await stripe().customers.retrieve(
 					subscription.customer as string,
 				);
-				let foundUserId: string | undefined;
+				let foundUserId: User.UserId | undefined;
 				if ("metadata" in customer) {
-					foundUserId = customer.metadata.userId;
+					foundUserId = customer.metadata.userId
+						? User.UserId.make(customer.metadata.userId)
+						: undefined;
 				}
 				if (!foundUserId) {
 					console.log("No user found in metadata, checking customer email");
diff --git a/apps/web/app/embed/[videoId]/page.tsx b/apps/web/app/embed/[videoId]/page.tsx
index 04a5550a62..c5cc03f100 100644
--- a/apps/web/app/embed/[videoId]/page.tsx
+++ b/apps/web/app/embed/[videoId]/page.tsx
@@ -11,7 +11,7 @@ import {
 import type { VideoMetadata } from "@cap/database/types";
 import { buildEnv } from "@cap/env";
 import { provideOptionalAuth, Videos, VideosPolicy } from "@cap/web-backend";
-import { Policy, type Video } from "@cap/web-domain";
+import { type Organisation, Policy, type Video } from "@cap/web-domain";
 import { eq, sql } from "drizzle-orm";
 import { Effect, Option } from "effect";
 import type { Metadata } from "next";
@@ -203,7 +203,7 @@ async function EmbedContent({
 	autoplay,
 }: {
 	video: Omit<typeof videos.$inferSelect, "password"> & {
-		sharedOrganization: { organizationId: string } | null;
+		sharedOrganization: { organizationId: Organisation.OrganisationId } | null;
 		hasActiveUpload: boolean | undefined;
 	};
 	autoplay: boolean;
diff --git a/apps/web/app/s/[videoId]/_components/Toolbar.tsx b/apps/web/app/s/[videoId]/_components/Toolbar.tsx
index 11e4336135..45eb245f26 100644
--- a/apps/web/app/s/[videoId]/_components/Toolbar.tsx
+++ b/apps/web/app/s/[videoId]/_components/Toolbar.tsx
@@ -1,6 +1,7 @@
 import type { userSelectProps } from "@cap/database/auth/session";
 import type { videos } from "@cap/database/schema";
 import { Button } from "@cap/ui";
+import { Comment, User } from "@cap/web-domain";
 import { AnimatePresence, motion } from "motion/react";
 import { startTransition, useEffect, useState } from "react";
 import { newComment } from "@/actions/videos/new-comment";
@@ -36,13 +37,13 @@ export const Toolbar = ({
 		const videoElement = document.querySelector("video") as HTMLVideoElement;
 		const currentTime = videoElement?.currentTime || 0;
 		const optimisticComment: CommentType = {
-			id: `temp-${Date.now()}`,
-			authorId: user?.id || "anonymous",
+			id: Comment.CommentId.make(`temp-${Date.now()}`),
+			authorId: User.UserId.make(user?.id || "anonymous"),
 			authorName: user?.name || "Anonymous",
 			content: emoji,
 			createdAt: new Date(),
 			videoId: data.id,
-			parentCommentId: "",
+			parentCommentId: Comment.CommentId.make(""),
 			type: "emoji",
 			timestamp: currentTime,
 			updatedAt: new Date(),
@@ -55,7 +56,7 @@ export const Toolbar = ({
 			const newCommentData = await newComment({
 				content: emoji,
 				videoId: data.id,
-				parentCommentId: "",
+				parentCommentId: Comment.CommentId.make(""),
 				type: "emoji",
 				timestamp: currentTime,
 			});
@@ -77,13 +78,13 @@ export const Toolbar = ({
 		const videoElement = document.querySelector("video") as HTMLVideoElement;
 		const currentTime = videoElement?.currentTime || 0;
 		const optimisticComment: CommentType = {
-			id: `temp-${Date.now()}`,
-			authorId: user?.id || "anonymous",
-			authorName: user?.name || "Anonymous",
+			id: Comment.CommentId.make(`temp-${Date.now()}`),
+			authorId: User.UserId.make(user?.id || "anonymous"),
+			authorName: Comment.CommentId.make(user?.name || "Anonymous"),
 			content: comment,
 			createdAt: new Date(),
 			videoId: data.id,
-			parentCommentId: "",
+			parentCommentId: Comment.CommentId.make(""),
 			type: "text",
 			timestamp: currentTime,
 			updatedAt: new Date(),
@@ -96,7 +97,7 @@ export const Toolbar = ({
 			const newCommentData = await newComment({
 				content: comment,
 				videoId: data.id,
-				parentCommentId: "",
+				parentCommentId: Comment.CommentId.make(""),
 				type: "text",
 				timestamp: currentTime,
 			});
diff --git a/apps/web/app/s/[videoId]/_components/tabs/Activity/Comment.tsx b/apps/web/app/s/[videoId]/_components/tabs/Activity/Comment.tsx
index d88e547016..f277028e03 100644
--- a/apps/web/app/s/[videoId]/_components/tabs/Activity/Comment.tsx
+++ b/apps/web/app/s/[videoId]/_components/tabs/Activity/Comment.tsx
@@ -1,5 +1,6 @@
 import type { userSelectProps } from "@cap/database/auth/session";
 import { Avatar, Button } from "@cap/ui";
+import type { Comment } from "@cap/web-domain";
 import { faReply, faTrash } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
@@ -12,14 +13,17 @@ import type { CommentType } from "../../../Share";
 import CommentInput from "./CommentInput";
 import { formatTimeAgo, formatTimestamp } from "./utils";
 
-const Comment: React.FC<{
+const CommentComponent: React.FC<{
 	comment: CommentType;
 	replies: CommentType[];
-	onReply: (commentId: string) => void;
-	replyingToId: string | null;
+	onReply: (commentId: Comment.CommentId) => void;
+	replyingToId: Comment.CommentId | null;
 	handleReply: (content: string) => void;
 	onCancelReply: () => void;
-	onDelete: (commentId: string, parentId?: string) => void;
+	onDelete: (
+		commentId: Comment.CommentId,
+		parentId?: Comment.CommentId,
+	) => void;
 	user: typeof userSelectProps | null;
 	level?: number;
 	onSeek?: (time: number) => void;
@@ -51,7 +55,10 @@ const Comment: React.FC<{
 			: [];
 
 	const handleDelete = () => {
-		if (window.confirm("Are you sure you want to delete this comment?")) {
+		if (
+			comment.parentCommentId &&
+			window.confirm("Are you sure you want to delete this comment?")
+		) {
 			onDelete(comment.id, comment.parentCommentId);
 		}
 	};
@@ -167,7 +174,7 @@ const Comment: React.FC<{
 			{nestedReplies.length > 0 && (
 				<div className="mt-3 space-y-3">
 					{nestedReplies.map((reply) => (
-						<Comment
+						<CommentComponent
 							key={reply.id}
 							comment={reply}
 							replies={replies}
@@ -187,4 +194,4 @@ const Comment: React.FC<{
 	);
 };
 
-export default Comment;
+export default CommentComponent;
diff --git a/apps/web/app/s/[videoId]/_components/tabs/Activity/Comments.tsx b/apps/web/app/s/[videoId]/_components/tabs/Activity/Comments.tsx
index e636bb2de3..e724d1f03c 100644
--- a/apps/web/app/s/[videoId]/_components/tabs/Activity/Comments.tsx
+++ b/apps/web/app/s/[videoId]/_components/tabs/Activity/Comments.tsx
@@ -1,6 +1,6 @@
 import type { userSelectProps } from "@cap/database/auth/session";
 import { Button } from "@cap/ui";
-import type { Video } from "@cap/web-domain";
+import { Comment, User, type Video } from "@cap/web-domain";
 import { faCommentSlash } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useSearchParams } from "next/navigation";
@@ -19,7 +19,7 @@ import {
 import { deleteComment } from "@/actions/videos/delete-comment";
 import { newComment } from "@/actions/videos/new-comment";
 import type { CommentType } from "../../../Share";
-import Comment from "./Comment";
+import CommentComponent from "./Comment";
 import CommentInput from "./CommentInput";
 import EmptyState from "./EmptyState";
 
@@ -50,7 +50,9 @@ export const Comments = Object.assign(
 		const replyParams = useSearchParams().get("reply");
 
 		const { user } = props;
-		const [replyingTo, setReplyingTo] = useState<string | null>(null);
+		const [replyingTo, setReplyingTo] = useState<Comment.CommentId | null>(
+			null,
+		);
 
 		const commentsContainerRef = useRef<HTMLDivElement>(null);
 
@@ -83,13 +85,13 @@ export const Comments = Object.assign(
 			const currentTime = videoElement?.currentTime || 0;
 
 			const optimisticComment: CommentType = {
-				id: `temp-${Date.now()}`,
-				authorId: user?.id || "anonymous",
+				id: Comment.CommentId.make(`temp-${Date.now()}`),
+				authorId: User.UserId.make(user?.id || "anonymous"),
 				authorName: user?.name || "Anonymous",
 				content,
 				createdAt: new Date(),
 				videoId: props.videoId,
-				parentCommentId: "",
+				parentCommentId: Comment.CommentId.make(""),
 				type: "text",
 				timestamp: currentTime,
 				updatedAt: new Date(),
@@ -104,7 +106,7 @@ export const Comments = Object.assign(
 				const data = await newComment({
 					content,
 					videoId: props.videoId,
-					parentCommentId: "",
+					parentCommentId: Comment.CommentId.make(""),
 					type: "text",
 					timestamp: currentTime,
 				});
@@ -125,8 +127,8 @@ export const Comments = Object.assign(
 				: replyingTo;
 
 			const optimisticReply: CommentType = {
-				id: `temp-reply-${Date.now()}`,
-				authorId: user?.id || "anonymous",
+				id: Comment.CommentId.make(`temp-reply-${Date.now()}`),
+				authorId: User.UserId.make(user?.id || "anonymous"),
 				authorName: user?.name || "Anonymous",
 				content,
 				createdAt: new Date(),
@@ -171,8 +173,8 @@ export const Comments = Object.assign(
 		};
 
 		const handleDeleteComment = async (
-			commentId: string,
-			parentId?: string,
+			commentId: Comment.CommentId,
+			parentId?: Comment.CommentId,
 		) => {
 			try {
 				await deleteComment({
@@ -208,7 +210,7 @@ export const Comments = Object.assign(
 				) : (
 					<div className="p-4 space-y-6">
 						{rootComments.map((comment) => (
-							<Comment
+							<CommentComponent
 								key={comment.id}
 								comment={comment}
 								replies={optimisticComments}
diff --git a/apps/web/app/s/[videoId]/page.tsx b/apps/web/app/s/[videoId]/page.tsx
index 246736232f..94a44f0974 100644
--- a/apps/web/app/s/[videoId]/page.tsx
+++ b/apps/web/app/s/[videoId]/page.tsx
@@ -16,7 +16,12 @@ import { buildEnv } from "@cap/env";
 import { Logo } from "@cap/ui";
 import { provideOptionalAuth, Videos } from "@cap/web-backend";
 import { VideosPolicy } from "@cap/web-backend/src/Videos/VideosPolicy";
-import { Policy, type Video } from "@cap/web-domain";
+import {
+	Comment,
+	type Organisation,
+	Policy,
+	type Video,
+} from "@cap/web-domain";
 import { eq, type InferSelectModel, sql } from "drizzle-orm";
 import { Effect, Option } from "effect";
 import type { Metadata } from "next";
@@ -32,6 +37,7 @@ import {
 import { createNotification } from "@/lib/Notification";
 import * as EffectRuntime from "@/lib/server";
 import { transcribeVideo } from "@/lib/transcribe";
+import { optionFromTOrFirst } from "@/utils/effect";
 import { isAiGenerationEnabled } from "@/utils/flags";
 import { PasswordOverlay } from "./_components/PasswordOverlay";
 import { ShareHeader } from "./_components/ShareHeader";
@@ -354,7 +360,7 @@ async function AuthorizedContent({
 		InferSelectModel<typeof videos>,
 		"folderId" | "password" | "settings"
 	> & {
-		sharedOrganization: { organizationId: string } | null;
+		sharedOrganization: { organizationId: Organisation.OrganisationId } | null;
 		hasPassword: boolean;
 		ownerIsPro?: boolean;
 		orgSettings?: OrganizationSettings | null;
@@ -379,8 +385,12 @@ async function AuthorizedContent({
 	}
 
 	const userId = user?.id;
-	const commentId = searchParams.comment as string | undefined;
-	const replyId = searchParams.reply as string | undefined;
+	const commentId = optionFromTOrFirst(searchParams.comment).pipe(
+		Option.map(Comment.CommentId.make),
+	);
+	const replyId = optionFromTOrFirst(searchParams.reply).pipe(
+		Option.map(Comment.CommentId.make),
+	);
 
 	// Fetch spaces data for the sharing dialog
 	let spacesData = null;
@@ -617,15 +627,15 @@ async function AuthorizedContent({
 		: Promise.resolve([]);
 
 	const commentsPromise = (async () => {
-		let toplLevelCommentId: string | undefined;
+		let toplLevelCommentId: Comment.CommentId | undefined;
 
-		if (replyId) {
+		if (Option.isSome(replyId)) {
 			const [parentComment] = await db()
 				.select({ parentCommentId: comments.parentCommentId })
 				.from(comments)
-				.where(eq(comments.id, replyId))
+				.where(eq(comments.id, replyId.value))
 				.limit(1);
-			toplLevelCommentId = parentComment?.parentCommentId;
+			toplLevelCommentId = parentComment?.parentCommentId ?? undefined;
 		}
 
 		const commentToBringToTheTop = toplLevelCommentId ?? commentId;
diff --git a/apps/web/components/forms/server.ts b/apps/web/components/forms/server.ts
index 5b952eb43d..ca96a87dfb 100644
--- a/apps/web/components/forms/server.ts
+++ b/apps/web/components/forms/server.ts
@@ -10,6 +10,7 @@ import {
 } from "@cap/database/schema";
 import { serverEnv } from "@cap/env";
 import { S3Buckets } from "@cap/web-backend";
+import { Organisation, type User } from "@cap/web-domain";
 import { eq } from "drizzle-orm";
 import { Effect, Option } from "effect";
 import { revalidatePath } from "next/cache";
@@ -34,12 +35,12 @@ export async function createOrganization(formData: FormData) {
 		throw new Error("Organization with this name already exists");
 	}
 
-	const organizationId = nanoId();
+	const organizationId = Organisation.OrganisationId.make(nanoId());
 
 	// Create the organization first
 	const orgValues: {
-		id: string;
-		ownerId: string;
+		id: Organisation.OrganisationId;
+		ownerId: User.UserId;
 		name: string;
 		iconUrl?: string;
 	} = {
diff --git a/apps/web/lib/Notification.ts b/apps/web/lib/Notification.ts
index 503574a2af..ed6edb0663 100644
--- a/apps/web/lib/Notification.ts
+++ b/apps/web/lib/Notification.ts
@@ -5,7 +5,7 @@ import { db } from "@cap/database";
 import { nanoId } from "@cap/database/helpers";
 import { comments, notifications, users, videos } from "@cap/database/schema";
 import type { Notification, NotificationBase } from "@cap/web-api-contract";
-import { Video } from "@cap/web-domain";
+import { type Comment, Video } from "@cap/web-domain";
 import { and, eq, sql } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 import type { UserPreferences } from "@/app/(org)/dashboard/dashboard-data";
@@ -25,7 +25,9 @@ type CreateNotificationInput<D = NotificationSpecificData> =
 	D extends NotificationSpecificData
 		? D["author"] extends never
 			? D
-			: Omit<D, "author"> & { authorId: string } & { parentCommentId?: string }
+			: Omit<D, "author"> & { authorId: string } & {
+					parentCommentId?: Comment.CommentId;
+				}
 		: never;
 
 export async function createNotification(
diff --git a/apps/web/lib/folder.ts b/apps/web/lib/folder.ts
index ef6d7c260e..89b686d5a5 100644
--- a/apps/web/lib/folder.ts
+++ b/apps/web/lib/folder.ts
@@ -14,7 +14,7 @@ import {
 	videoUploads,
 } from "@cap/database/schema";
 import { Database } from "@cap/web-backend";
-import type { Video } from "@cap/web-domain";
+import type { Organisation, Space, Video } from "@cap/web-domain";
 import { CurrentUser, Folder } from "@cap/web-domain";
 import { and, desc, eq } from "drizzle-orm";
 import { sql } from "drizzle-orm/sql";
@@ -271,8 +271,8 @@ export const getChildFolders = Effect.fn(function* (
 	folderId: Folder.FolderId,
 	root:
 		| { variant: "user" }
-		| { variant: "space"; spaceId: string }
-		| { variant: "org"; organizationId: string },
+		| { variant: "space"; spaceId: Space.SpaceIdOrOrganisationId }
+		| { variant: "org"; organizationId: Organisation.OrganisationId },
 ) {
 	const db = yield* Database;
 
diff --git a/apps/web/utils/effect.ts b/apps/web/utils/effect.ts
new file mode 100644
index 0000000000..11025f0966
--- /dev/null
+++ b/apps/web/utils/effect.ts
@@ -0,0 +1,4 @@
+import { Option } from "effect";
+
+export const optionFromTOrFirst = (p: string | string[] | undefined) =>
+	Option.fromNullable(Array.isArray(p) ? p[0] : p);
diff --git a/apps/web/utils/helpers.ts b/apps/web/utils/helpers.ts
index d1eb43767b..4a7c174f94 100644
--- a/apps/web/utils/helpers.ts
+++ b/apps/web/utils/helpers.ts
@@ -15,7 +15,7 @@ export const allowedOrigins = [
 	"cap.link",
 ];
 
-export function getHeaders(origin: string) {
+export function getHeaders(origin: string | null) {
 	// Allow "*" for custom domains or allowedOrigins for main domains
 	return {
 		"Access-Control-Allow-Origin": origin || "*",
diff --git a/packages/database/auth/auth-options.ts b/packages/database/auth/auth-options.ts
index 04629338f8..3f0b8c927c 100644
--- a/packages/database/auth/auth-options.ts
+++ b/packages/database/auth/auth-options.ts
@@ -1,5 +1,6 @@
 import crypto from "node:crypto";
 import { serverEnv } from "@cap/env";
+import { Organisation, User } from "@cap/web-domain";
 import { eq } from "drizzle-orm";
 import type { NextAuthOptions } from "next-auth";
 import { getServerSession as _getServerSession } from "next-auth";
@@ -8,7 +9,6 @@ import EmailProvider from "next-auth/providers/email";
 import GoogleProvider from "next-auth/providers/google";
 import type { Provider } from "next-auth/providers/index";
 import WorkOSProvider from "next-auth/providers/workos";
-
 import { dub } from "../dub.ts";
 import { sendEmail } from "../emails/config.ts";
 import { nanoId } from "../helpers.ts";
@@ -125,7 +125,7 @@ export const authOptions = (): NextAuthOptions => {
 				const [dbUser] = await db()
 					.select()
 					.from(users)
-					.where(eq(users.id, user.id))
+					.where(eq(users.id, User.UserId.make(user.id)))
 					.limit(1);
 
 				const needsOrganizationSetup =
@@ -168,25 +168,29 @@ export const authOptions = (): NextAuthOptions => {
 						);
 					}
 
-					const organizationId = nanoId();
+					const organizationId = Organisation.OrganisationId.make(nanoId());
 
-					await db().insert(organizations).values({
-						id: organizationId,
-						name: "My Organization",
-						ownerId: user.id,
-					});
+					await db()
+						.insert(organizations)
+						.values({
+							id: organizationId,
+							name: "My Organization",
+							ownerId: User.UserId.make(user.id),
+						});
 
-					await db().insert(organizationMembers).values({
-						id: nanoId(),
-						userId: user.id,
-						organizationId: organizationId,
-						role: "owner",
-					});
+					await db()
+						.insert(organizationMembers)
+						.values({
+							id: nanoId(),
+							userId: User.UserId.make(user.id),
+							organizationId: organizationId,
+							role: "owner",
+						});
 
 					await db()
 						.update(users)
 						.set({ activeOrganizationId: organizationId })
-						.where(eq(users.id, user.id));
+						.where(eq(users.id, User.UserId.make(user.id)));
 				}
 			},
 		},
diff --git a/packages/database/auth/drizzle-adapter.ts b/packages/database/auth/drizzle-adapter.ts
index 94a196a022..31802c1033 100644
--- a/packages/database/auth/drizzle-adapter.ts
+++ b/packages/database/auth/drizzle-adapter.ts
@@ -1,9 +1,9 @@
 import { STRIPE_AVAILABLE, stripe } from "@cap/utils";
+import { Organisation, User } from "@cap/web-domain";
 import { and, eq } from "drizzle-orm";
 import type { PlanetScaleDatabase } from "drizzle-orm/planetscale-serverless";
 import type { Adapter } from "next-auth/adapters";
 import type Stripe from "stripe";
-
 import { nanoId } from "../helpers.ts";
 import { accounts, sessions, users, verificationTokens } from "../schema.ts";
 
@@ -11,12 +11,12 @@ export function DrizzleAdapter(db: PlanetScaleDatabase): Adapter {
 	return {
 		async createUser(userData: any) {
 			await db.insert(users).values({
-				id: nanoId(),
+				id: User.UserId.make(nanoId()),
 				email: userData.email,
 				emailVerified: userData.emailVerified,
 				name: userData.name,
 				image: userData.image,
-				activeOrganizationId: "",
+				activeOrganizationId: Organisation.OrganisationId.make(""),
 			});
 			const rows = await db
 				.select()
@@ -88,7 +88,7 @@ export function DrizzleAdapter(db: PlanetScaleDatabase): Adapter {
 			const rows = await db
 				.select()
 				.from(users)
-				.where(eq(users.id, id))
+				.where(eq(users.id, User.UserId.make(id)))
 				.limit(1);
 			const row = rows[0];
 			return row ?? null;
@@ -122,22 +122,25 @@ export function DrizzleAdapter(db: PlanetScaleDatabase): Adapter {
 		},
 		async updateUser({ id, ...userData }) {
 			if (!id) throw new Error("User not found");
-			await db.update(users).set(userData).where(eq(users.id, id));
+			await db
+				.update(users)
+				.set(userData)
+				.where(eq(users.id, User.UserId.make(id)));
 			const rows = await db
 				.select()
 				.from(users)
-				.where(eq(users.id, id))
+				.where(eq(users.id, User.UserId.make(id)))
 				.limit(1);
 			const row = rows[0];
 			if (!row) throw new Error("User not found");
 			return row;
 		},
 		async deleteUser(userId) {
-			await db.delete(users).where(eq(users.id, userId));
+			await db.delete(users).where(eq(users.id, User.UserId.make(userId)));
 		},
 		async linkAccount(account: any) {
 			await db.insert(accounts).values({
-				id: nanoId(),
+				id: User.UserId.make(nanoId()),
 				userId: account.userId,
 				type: account.type,
 				provider: account.provider,
@@ -166,7 +169,7 @@ export function DrizzleAdapter(db: PlanetScaleDatabase): Adapter {
 				id: nanoId(),
 				expires: data.expires,
 				sessionToken: data.sessionToken,
-				userId: data.userId,
+				userId: User.UserId.make(data.userId),
 			});
 			const rows = await db
 				.select()
@@ -199,16 +202,16 @@ export function DrizzleAdapter(db: PlanetScaleDatabase): Adapter {
 				user,
 				session: {
 					id: session.id,
-					userId: session.userId,
+					userId: User.UserId.make(session.userId),
 					sessionToken: session.sessionToken,
 					expires: session.expires,
 				},
 			};
 		},
-		async updateSession(session) {
+		async updateSession(session: any) {
 			await db
 				.update(sessions)
-				.set(session)
+				.set(session as any)
 				.where(eq(sessions.sessionToken, session.sessionToken));
 			const rows = await db
 				.select()
diff --git a/packages/database/auth/session.ts b/packages/database/auth/session.ts
index 3434da8014..05da916a69 100644
--- a/packages/database/auth/session.ts
+++ b/packages/database/auth/session.ts
@@ -1,3 +1,4 @@
+import { User } from "@cap/web-domain";
 import { eq, type InferSelectModel } from "drizzle-orm";
 import { getServerSession } from "next-auth";
 import { cache } from "react";
@@ -20,7 +21,7 @@ export const getCurrentUser = cache(
 		const [currentUser] = await db()
 			.select()
 			.from(users)
-			.where(eq(users.id, session.user.id));
+			.where(eq(users.id, User.UserId.make(session.user.id)));
 
 		return currentUser ?? null;
 	},
diff --git a/packages/database/schema.ts b/packages/database/schema.ts
index 035e895ade..bac98ae965 100644
--- a/packages/database/schema.ts
+++ b/packages/database/schema.ts
@@ -1,4 +1,12 @@
-import type { Folder, S3Bucket, Video } from "@cap/web-domain";
+import type {
+	Comment,
+	Folder,
+	Organisation,
+	S3Bucket,
+	Space,
+	User,
+	Video,
+} from "@cap/web-domain";
 import {
 	boolean,
 	customType,
@@ -50,7 +58,7 @@ const encryptedTextNullable = customType<{ data: string; notNull: false }>({
 export const users = mysqlTable(
 	"users",
 	{
-		id: nanoId("id").notNull().primaryKey().unique(),
+		id: nanoId("id").notNull().primaryKey().unique().$type<User.UserId>(),
 		name: varchar("name", { length: 255 }),
 		lastName: varchar("lastName", { length: 255 }),
 		email: varchar("email", { length: 255 }).unique().notNull(),
@@ -85,13 +93,16 @@ export const users = mysqlTable(
 				};
 			} | null>()
 			.default(null),
-		activeOrganizationId: nanoId("activeOrganizationId"),
+		activeOrganizationId: nanoId(
+			"activeOrganizationId",
+		).$type<Organisation.OrganisationId>(),
 		created_at: timestamp("created_at").notNull().defaultNow(),
 		updated_at: timestamp("updated_at").notNull().defaultNow().onUpdateNow(),
 		onboarding_completed_at: timestamp("onboarding_completed_at"),
 		customBucket: nanoIdNullable("customBucket"),
 		inviteQuota: int("inviteQuota").notNull().default(1),
-		defaultOrgId: nanoIdNullable("defaultOrgId"),
+		defaultOrgId:
+			nanoIdNullable("defaultOrgId").$type<Organisation.OrganisationId>(),
 	},
 	(table) => ({
 		emailIndex: uniqueIndex("email_idx").on(table.email),
@@ -130,7 +141,7 @@ export const sessions = mysqlTable(
 	{
 		id: nanoId("id").notNull().primaryKey().unique(),
 		sessionToken: varchar("sessionToken", { length: 255 }).unique().notNull(),
-		userId: nanoId("userId").notNull(),
+		userId: nanoId("userId").notNull().$type<User.UserId>(),
 		expires: datetime("expires").notNull(),
 		created_at: timestamp("created_at").notNull().defaultNow(),
 		updated_at: timestamp("updated_at").notNull().defaultNow().onUpdateNow(),
@@ -152,9 +163,13 @@ export const verificationTokens = mysqlTable("verification_tokens", {
 export const organizations = mysqlTable(
 	"organizations",
 	{
-		id: nanoId("id").notNull().primaryKey().unique(),
+		id: nanoId("id")
+			.notNull()
+			.primaryKey()
+			.unique()
+			.$type<Organisation.OrganisationId>(),
 		name: varchar("name", { length: 255 }).notNull(),
-		ownerId: nanoId("ownerId").notNull(),
+		ownerId: nanoId("ownerId").notNull().$type<User.UserId>(),
 		metadata: json("metadata"),
 		allowedEmailDomain: varchar("allowedEmailDomain", { length: 255 }),
 		customDomain: varchar("customDomain", { length: 255 }),
@@ -184,8 +199,10 @@ export const organizationMembers = mysqlTable(
 	"organization_members",
 	{
 		id: nanoId("id").notNull().primaryKey().unique(),
-		userId: nanoId("userId").notNull(),
-		organizationId: nanoId("organizationId").notNull(),
+		userId: nanoId("userId").notNull().$type<User.UserId>(),
+		organizationId: nanoId("organizationId")
+			.notNull()
+			.$type<Organisation.OrganisationId>(),
 		role: varchar("role", { length: 255 })
 			.notNull()
 			.$type<OrganisationMemberRole>(),
@@ -206,9 +223,11 @@ export const organizationInvites = mysqlTable(
 	"organization_invites",
 	{
 		id: nanoId("id").notNull().primaryKey().unique(),
-		organizationId: nanoId("organizationId").notNull(),
+		organizationId: nanoId("organizationId")
+			.notNull()
+			.$type<Organisation.OrganisationId>(),
 		invitedEmail: varchar("invitedEmail", { length: 255 }).notNull(),
-		invitedByUserId: nanoId("invitedByUserId").notNull(),
+		invitedByUserId: nanoId("invitedByUserId").notNull().$type<User.UserId>(),
 		role: varchar("role", { length: 255 })
 			.notNull()
 			.$type<OrganisationMemberRole>(),
@@ -238,10 +257,12 @@ export const folders = mysqlTable(
 		})
 			.notNull()
 			.default("normal"),
-		organizationId: nanoId("organizationId").notNull(),
-		createdById: nanoId("createdById").notNull(),
-		parentId: nanoIdNullable("parentId").$type<Folder.FolderId | null>(),
-		spaceId: nanoIdNullable("spaceId"),
+		organizationId: nanoId("organizationId")
+			.notNull()
+			.$type<Organisation.OrganisationId>(),
+		createdById: nanoId("createdById").notNull().$type<User.UserId>(),
+		parentId: nanoIdNullable("parentId").$type<Folder.FolderId>(),
+		spaceId: nanoIdNullable("spaceId").$type<Space.SpaceIdOrOrganisationId>(),
 		createdAt: timestamp("createdAt").notNull().defaultNow(),
 		updatedAt: timestamp("updatedAt").notNull().defaultNow().onUpdateNow(),
 	},
@@ -257,8 +278,8 @@ export const videos = mysqlTable(
 	"videos",
 	{
 		id: nanoId("id").notNull().primaryKey().unique().$type<Video.VideoId>(),
-		ownerId: nanoId("ownerId").notNull(),
-		orgId: nanoIdRequired("orgId"),
+		ownerId: nanoId("ownerId").notNull().$type<User.UserId>(),
+		orgId: nanoIdRequired("orgId").$type<Organisation.OrganisationId>(),
 		name: varchar("name", { length: 255 }).notNull().default("My Video"),
 		bucket: nanoIdNullable("bucket").$type<S3Bucket.S3BucketId>(),
 		// in seconds
@@ -315,8 +336,10 @@ export const sharedVideos = mysqlTable(
 	{
 		id: nanoId("id").notNull().primaryKey().unique(),
 		videoId: nanoId("videoId").notNull().$type<Video.VideoId>(),
-		organizationId: nanoId("organizationId").notNull(),
-		sharedByUserId: nanoId("sharedByUserId").notNull(),
+		organizationId: nanoId("organizationId")
+			.notNull()
+			.$type<Organisation.OrganisationId>(),
+		sharedByUserId: nanoId("sharedByUserId").notNull().$type<User.UserId>(),
 		sharedAt: timestamp("sharedAt").notNull().defaultNow(),
 	},
 	(table) => ({
@@ -335,15 +358,16 @@ export const sharedVideos = mysqlTable(
 export const comments = mysqlTable(
 	"comments",
 	{
-		id: nanoId("id").notNull().primaryKey().unique(),
+		id: nanoId("id").notNull().primaryKey().unique().$type<Comment.CommentId>(),
 		type: varchar("type", { length: 6, enum: ["emoji", "text"] }).notNull(),
 		content: text("content").notNull(),
 		timestamp: float("timestamp"),
-		authorId: nanoId("authorId").notNull(),
+		authorId: nanoId("authorId").notNull().$type<User.UserId>(),
 		videoId: nanoId("videoId").notNull().$type<Video.VideoId>(),
 		createdAt: timestamp("createdAt").notNull().defaultNow(),
 		updatedAt: timestamp("updatedAt").notNull().defaultNow().onUpdateNow(),
-		parentCommentId: nanoId("parentCommentId"),
+		parentCommentId:
+			nanoIdNullable("parentCommentId").$type<Comment.CommentId>(),
 	},
 	(table) => ({
 		videoIdIndex: index("video_id_idx").on(table.videoId),
@@ -358,8 +382,8 @@ export const notifications = mysqlTable(
 	"notifications",
 	{
 		id: nanoId("id").notNull().primaryKey().unique(),
-		orgId: nanoId("orgId").notNull(),
-		recipientId: nanoId("recipientId").notNull(),
+		orgId: nanoId("orgId").notNull().$type<Organisation.OrganisationId>(),
+		recipientId: nanoId("recipientId").notNull().$type<User.UserId>(),
 		type: varchar("type", { length: 10 })
 			.notNull()
 			.$type<"view" | "comment" | "reply" | "reaction" /*| "mention"*/>(),
@@ -395,7 +419,7 @@ export const notifications = mysqlTable(
 
 export const s3Buckets = mysqlTable("s3_buckets", {
 	id: nanoId("id").notNull().primaryKey().unique().$type<S3Bucket.S3BucketId>(),
-	ownerId: nanoId("ownerId").notNull(),
+	ownerId: nanoId("ownerId").notNull().$type<User.UserId>(),
 	// Use encryptedText for sensitive fields
 	region: encryptedText("region").notNull(),
 	endpoint: encryptedTextNullable("endpoint"),
@@ -418,7 +442,7 @@ export const notificationsRelations = relations(notifications, ({ one }) => ({
 
 export const authApiKeys = mysqlTable("auth_api_keys", {
 	id: varchar("id", { length: 36 }).notNull().primaryKey().unique(),
-	userId: nanoId("userId").notNull(),
+	userId: nanoId("userId").notNull().$type<User.UserId>(),
 	createdAt: timestamp("createdAt").defaultNow().notNull(),
 });
 
@@ -550,11 +574,17 @@ export const sharedVideosRelations = relations(sharedVideos, ({ one }) => ({
 export const spaces = mysqlTable(
 	"spaces",
 	{
-		id: nanoId("id").notNull().primaryKey().unique(),
+		id: nanoId("id")
+			.notNull()
+			.primaryKey()
+			.unique()
+			.$type<Space.SpaceIdOrOrganisationId>(),
 		primary: boolean("primary").notNull().default(false),
 		name: varchar("name", { length: 255 }).notNull(),
-		organizationId: nanoId("organizationId").notNull(),
-		createdById: nanoId("createdById").notNull(),
+		organizationId: nanoId("organizationId")
+			.notNull()
+			.$type<Organisation.OrganisationId>(),
+		createdById: nanoId("createdById").notNull().$type<User.UserId>(),
 		iconUrl: varchar("iconUrl", { length: 255 }),
 		description: varchar("description", { length: 1000 }),
 		createdAt: timestamp("createdAt").notNull().defaultNow(),
@@ -573,8 +603,8 @@ export const spaceMembers = mysqlTable(
 	"space_members",
 	{
 		id: nanoId("id").notNull().primaryKey().unique(),
-		spaceId: nanoId("spaceId").notNull(),
-		userId: nanoId("userId").notNull(),
+		spaceId: nanoId("spaceId").notNull().$type<Space.SpaceIdOrOrganisationId>(),
+		userId: nanoId("userId").notNull().$type<User.UserId>(),
 		role: varchar("role", { length: 255 })
 			.notNull()
 			.default("member")
@@ -596,10 +626,10 @@ export const spaceVideos = mysqlTable(
 	"space_videos",
 	{
 		id: nanoId("id").notNull().primaryKey().unique(),
-		spaceId: nanoId("spaceId").notNull(),
-		folderId: nanoIdNullable("folderId"),
-		videoId: nanoId("videoId").notNull(),
-		addedById: nanoId("addedById").notNull(),
+		spaceId: nanoId("spaceId").notNull().$type<Space.SpaceIdOrOrganisationId>(),
+		folderId: nanoIdNullable("folderId").$type<Folder.FolderId>(),
+		videoId: nanoId("videoId").notNull().$type<Video.VideoId>(),
+		addedById: nanoId("addedById").notNull().$type<User.UserId>(),
 		addedAt: timestamp("addedAt").notNull().defaultNow(),
 	},
 	(table) => ({
@@ -672,7 +702,7 @@ export const foldersRelations = relations(folders, ({ one, many }) => ({
 }));
 
 export const videoUploads = mysqlTable("video_uploads", {
-	videoId: nanoId("video_id").primaryKey().notNull(),
+	videoId: nanoId("video_id").primaryKey().notNull().$type<Video.VideoId>(),
 	uploaded: int("uploaded").notNull().default(0),
 	total: int("total").notNull().default(0),
 	startedAt: timestamp("started_at").notNull().defaultNow(),
@@ -683,7 +713,9 @@ export const importedVideos = mysqlTable(
 	"imported_videos",
 	{
 		id: nanoId("id").notNull(),
-		orgId: nanoIdNullable("orgId").notNull(),
+		orgId: nanoIdNullable("orgId")
+			.notNull()
+			.$type<Organisation.OrganisationId>(),
 		source: varchar("source", { length: 255, enum: ["loom"] }).notNull(),
 		sourceId: varchar("source_id", { length: 255 }).notNull(),
 	},
diff --git a/packages/web-backend/src/Folders/index.ts b/packages/web-backend/src/Folders/index.ts
index e8e488b3c0..57dbd2cb75 100644
--- a/packages/web-backend/src/Folders/index.ts
+++ b/packages/web-backend/src/Folders/index.ts
@@ -4,6 +4,7 @@ import {
 	Folder,
 	Organisation,
 	Policy,
+	type Space,
 	User,
 } from "@cap/web-domain";
 import * as Dz from "drizzle-orm";
@@ -23,7 +24,7 @@ export class Folders extends Effect.Service<Folders>()("Folders", {
 		const deleteFolder = (folder: {
 			id: Folder.FolderId;
 			parentId: Folder.FolderId | null;
-			spaceId: string | null;
+			spaceId: Space.SpaceIdOrOrganisationId | null;
 		}): Effect.Effect<void, DatabaseError, Database> =>
 			Effect.gen(function* () {
 				const children = yield* db.execute((db) =>
@@ -73,7 +74,7 @@ export class Folders extends Effect.Service<Folders>()("Folders", {
 			create: Effect.fn("Folders.create")(function* (data: {
 				name: string;
 				color: Folder.FolderColor;
-				spaceId: Option.Option<string>;
+				spaceId: Option.Option<Space.SpaceIdOrOrganisationId>;
 				parentId: Option.Option<Folder.FolderId>;
 			}) {
 				const user = yield* CurrentUser;
diff --git a/packages/web-backend/src/Organisations/OrganisationsPolicy.ts b/packages/web-backend/src/Organisations/OrganisationsPolicy.ts
index 1d0f5475e2..da7a34e928 100644
--- a/packages/web-backend/src/Organisations/OrganisationsPolicy.ts
+++ b/packages/web-backend/src/Organisations/OrganisationsPolicy.ts
@@ -1,4 +1,4 @@
-import { Policy } from "@cap/web-domain";
+import { type Organisation, Policy } from "@cap/web-domain";
 import { Effect, Option } from "effect";
 
 import { Database } from "../Database.ts";
@@ -11,12 +11,12 @@ export class OrganisationsPolicy extends Effect.Service<OrganisationsPolicy>()(
 		effect: Effect.gen(function* () {
 			const repo = yield* OrganisationsRepo;
 
-			const isMember = (orgId: string) =>
+			const isMember = (orgId: Organisation.OrganisationId) =>
 				Policy.policy((user) =>
 					repo.membership(user.id, orgId).pipe(Effect.map(Option.isSome)),
 				);
 
-			const isOwner = (orgId: string) =>
+			const isOwner = (orgId: Organisation.OrganisationId) =>
 				Policy.policy((user) =>
 					repo.membership(user.id, orgId).pipe(
 						Effect.map((v) =>
diff --git a/packages/web-backend/src/Organisations/OrganisationsRepo.ts b/packages/web-backend/src/Organisations/OrganisationsRepo.ts
index 488f352a38..0c0b3736c0 100644
--- a/packages/web-backend/src/Organisations/OrganisationsRepo.ts
+++ b/packages/web-backend/src/Organisations/OrganisationsRepo.ts
@@ -1,5 +1,5 @@
 import * as Db from "@cap/database/schema";
-import type { Video } from "@cap/web-domain";
+import type { Organisation, User, Video } from "@cap/web-domain";
 import * as Dz from "drizzle-orm";
 import { Array, Effect } from "effect";
 
@@ -12,7 +12,7 @@ export class OrganisationsRepo extends Effect.Service<OrganisationsRepo>()(
 			const db = yield* Database;
 
 			return {
-				membershipForVideo: (userId: string, videoId: Video.VideoId) =>
+				membershipForVideo: (userId: User.UserId, videoId: Video.VideoId) =>
 					db.execute((db) =>
 						db
 							.select({ membershipId: Db.organizationMembers.id })
@@ -31,7 +31,7 @@ export class OrganisationsRepo extends Effect.Service<OrganisationsRepo>()(
 								),
 							),
 					),
-				membership: (userId: string, orgId: string) =>
+				membership: (userId: User.UserId, orgId: Organisation.OrganisationId) =>
 					db
 						.execute((db) =>
 							db
diff --git a/packages/web-backend/src/S3Buckets/S3BucketsRepo.ts b/packages/web-backend/src/S3Buckets/S3BucketsRepo.ts
index 3a6fb3365f..677c7e3692 100644
--- a/packages/web-backend/src/S3Buckets/S3BucketsRepo.ts
+++ b/packages/web-backend/src/S3Buckets/S3BucketsRepo.ts
@@ -1,5 +1,5 @@
 import * as Db from "@cap/database/schema";
-import { S3Bucket, type Video } from "@cap/web-domain";
+import { S3Bucket, type User, type Video } from "@cap/web-domain";
 import * as Dz from "drizzle-orm";
 import { Effect, Option } from "effect";
 
@@ -49,7 +49,7 @@ export class S3BucketsRepo extends Effect.Service<S3BucketsRepo>()(
 			);
 
 			const getForUser = Effect.fn("S3BucketsRepo.getForUser")(
-				(userId: string) =>
+				(userId: User.UserId) =>
 					Effect.gen(function* () {
 						const [res] = yield* db.execute((db) =>
 							db
diff --git a/packages/web-backend/src/S3Buckets/index.ts b/packages/web-backend/src/S3Buckets/index.ts
index b1e7c30253..3643374e13 100644
--- a/packages/web-backend/src/S3Buckets/index.ts
+++ b/packages/web-backend/src/S3Buckets/index.ts
@@ -2,7 +2,7 @@ import * as S3 from "@aws-sdk/client-s3";
 import * as CloudFrontPresigner from "@aws-sdk/cloudfront-signer";
 import { decrypt } from "@cap/database/crypto";
 import { S3_BUCKET_URL } from "@cap/utils";
-import type { S3Bucket } from "@cap/web-domain";
+import type { S3Bucket, User } from "@cap/web-domain";
 import { awsCredentialsProvider } from "@vercel/functions/oidc";
 import { Config, Effect, Layer, Option } from "effect";
 
@@ -174,8 +174,9 @@ export class S3Buckets extends Effect.Service<S3Buckets>()("S3Buckets", {
 
 				return yield* getBucketAccess(customBucket);
 			}),
+
 			getBucketAccessForUser: Effect.fn("S3Buckets.getProviderForUser")(
-				function* (userId: string) {
+				function* (userId: User.UserId) {
 					const customBucket = yield* repo
 						.getForUser(userId)
 						.pipe(Effect.option, Effect.map(Option.flatten));
@@ -191,6 +192,6 @@ export class S3Buckets extends Effect.Service<S3Buckets>()("S3Buckets", {
 		Effect.flatMap(S3Buckets, (b) =>
 			b.getBucketAccess(Option.fromNullable(bucketId).pipe(Option.flatten)),
 		);
-	static getBucketAccessForUser = (userId: string) =>
+	static getBucketAccessForUser = (userId: User.UserId) =>
 		Effect.flatMap(S3Buckets, (b) => b.getBucketAccessForUser(userId));
 }
diff --git a/packages/web-backend/src/Spaces/SpacesPolicy.ts b/packages/web-backend/src/Spaces/SpacesPolicy.ts
index 4e06726fe9..a342ecfcbc 100644
--- a/packages/web-backend/src/Spaces/SpacesPolicy.ts
+++ b/packages/web-backend/src/Spaces/SpacesPolicy.ts
@@ -1,4 +1,4 @@
-import { Policy } from "@cap/web-domain";
+import { Policy, type Space } from "@cap/web-domain";
 import { Effect, Option } from "effect";
 
 import { Database } from "../Database.ts";
@@ -11,12 +11,12 @@ export class SpacesPolicy extends Effect.Service<SpacesPolicy>()(
 		effect: Effect.gen(function* () {
 			const repo = yield* SpacesRepo;
 
-			const hasMembership = (spaceId: string) =>
+			const hasMembership = (spaceId: Space.SpaceIdOrOrganisationId) =>
 				Policy.policy((user) =>
 					repo.membership(user.id, spaceId).pipe(Effect.map(Option.isSome)),
 				);
 
-			const isOwner = (spaceId: string) =>
+			const isOwner = (spaceId: Space.SpaceIdOrOrganisationId) =>
 				Policy.policy(
 					Effect.fn(function* (user) {
 						const space = yield* repo.getById(spaceId);
@@ -26,7 +26,7 @@ export class SpacesPolicy extends Effect.Service<SpacesPolicy>()(
 					}),
 				);
 
-			const isMember = (spaceId: string) =>
+			const isMember = (spaceId: Space.SpaceIdOrOrganisationId) =>
 				Policy.any(isOwner(spaceId), hasMembership(spaceId));
 
 			return { isMember, isOwner };
diff --git a/packages/web-backend/src/Spaces/SpacesRepo.ts b/packages/web-backend/src/Spaces/SpacesRepo.ts
index 4d6e691b7d..1406e61bd4 100644
--- a/packages/web-backend/src/Spaces/SpacesRepo.ts
+++ b/packages/web-backend/src/Spaces/SpacesRepo.ts
@@ -1,5 +1,5 @@
 import * as Db from "@cap/database/schema";
-import type { Video } from "@cap/web-domain";
+import type { Space, User, Video } from "@cap/web-domain";
 import * as Dz from "drizzle-orm";
 import { Array, Effect } from "effect";
 
@@ -10,7 +10,7 @@ export class SpacesRepo extends Effect.Service<SpacesRepo>()("SpacesRepo", {
 		const db = yield* Database;
 
 		return {
-			membershipForVideo: (userId: string, videoId: Video.VideoId) =>
+			membershipForVideo: (userId: User.UserId, videoId: Video.VideoId) =>
 				db
 					.execute((db) =>
 						db
@@ -28,7 +28,11 @@ export class SpacesRepo extends Effect.Service<SpacesRepo>()("SpacesRepo", {
 							),
 					)
 					.pipe(Effect.map(Array.get(0))),
-			membership: (userId: string, spaceId: string) =>
+
+			membership: (
+				userId: User.UserId,
+				spaceId: Space.SpaceIdOrOrganisationId,
+			) =>
 				db
 					.execute((db) =>
 						db
@@ -45,7 +49,8 @@ export class SpacesRepo extends Effect.Service<SpacesRepo>()("SpacesRepo", {
 							),
 					)
 					.pipe(Effect.map(Array.get(0))),
-			getById: (spaceId: string) =>
+
+			getById: (spaceId: Space.SpaceIdOrOrganisationId) =>
 				db
 					.execute((db) =>
 						db.select().from(Db.spaces).where(Dz.eq(Db.spaces.id, spaceId)),
diff --git a/packages/web-backend/src/Spaces/index.ts b/packages/web-backend/src/Spaces/index.ts
index caf6643856..65cf02c195 100644
--- a/packages/web-backend/src/Spaces/index.ts
+++ b/packages/web-backend/src/Spaces/index.ts
@@ -1,5 +1,5 @@
 import * as Db from "@cap/database/schema";
-import { Policy } from "@cap/web-domain";
+import { type Organisation, Policy, type Space } from "@cap/web-domain";
 import * as Dz from "drizzle-orm";
 import { Effect } from "effect";
 
@@ -15,7 +15,9 @@ export class Spaces extends Effect.Service<Spaces>()("Spaces", {
 
 		// this sucks but right now org ids are also valid space ids,
 		// since the whole-org space is just the org id
-		const getSpaceOrOrg = Effect.fn(function* (spaceOrOrgId: string) {
+		const getSpaceOrOrg = Effect.fn(function* (
+			spaceOrOrgId: Space.SpaceIdOrOrganisationId,
+		) {
 			const [[space], [org]] = yield* Effect.all([
 				db.execute((db) =>
 					db
@@ -37,7 +39,12 @@ export class Spaces extends Effect.Service<Spaces>()("Spaces", {
 							ownerId: Db.organizations.ownerId,
 						})
 						.from(Db.organizations)
-						.where(Dz.eq(Db.organizations.id, spaceOrOrgId))
+						.where(
+							Dz.eq(
+								Db.organizations.id,
+								spaceOrOrgId as Organisation.OrganisationId,
+							),
+						)
 						.limit(1),
 				),
 			]);
diff --git a/packages/web-domain/src/Authentication.ts b/packages/web-domain/src/Authentication.ts
index d69ed5d5c6..66d1578281 100644
--- a/packages/web-domain/src/Authentication.ts
+++ b/packages/web-domain/src/Authentication.ts
@@ -3,10 +3,15 @@ import { RpcMiddleware } from "@effect/rpc";
 import { Context, Schema } from "effect";
 
 import { InternalError } from "./Errors.ts";
+import type { Organisation, User } from "./index.ts";
 
 export class CurrentUser extends Context.Tag("CurrentUser")<
 	CurrentUser,
-	{ id: string; email: string; activeOrganizationId: string }
+	{
+		id: User.UserId;
+		email: string;
+		activeOrganizationId: Organisation.OrganisationId;
+	}
 >() {}
 
 export class HttpAuthMiddleware extends HttpApiMiddleware.Tag<HttpAuthMiddleware>()(
diff --git a/packages/web-domain/src/Folder.ts b/packages/web-domain/src/Folder.ts
index 94f864d03e..561badfb82 100644
--- a/packages/web-domain/src/Folder.ts
+++ b/packages/web-domain/src/Folder.ts
@@ -5,7 +5,7 @@ import { RpcAuthMiddleware } from "./Authentication.ts";
 import { InternalError } from "./Errors.ts";
 import { OrganisationId } from "./Organisation.ts";
 import { PolicyDeniedError } from "./Policy.ts";
-import { SpaceId } from "./Space.ts";
+import { SpaceIdOrOrganisationId } from "./Space.ts";
 import { UserId } from "./User.ts";
 
 export const FolderId = Schema.String.pipe(Schema.brand("FolderId"));
@@ -40,7 +40,7 @@ export class Folder extends Schema.Class<Folder>("Folder")({
 	color: FolderColor,
 	organizationId: OrganisationId,
 	createdById: UserId,
-	spaceId: Schema.OptionFromNullOr(Schema.String),
+	spaceId: Schema.OptionFromNullOr(SpaceIdOrOrganisationId),
 	parentId: Schema.OptionFromNullOr(FolderId),
 }) {}
 
@@ -61,7 +61,7 @@ export class FolderRpcs extends RpcGroup.make(
 		payload: Schema.Struct({
 			name: Schema.String,
 			color: FolderColor,
-			spaceId: Schema.OptionFromUndefinedOr(SpaceId),
+			spaceId: Schema.OptionFromUndefinedOr(SpaceIdOrOrganisationId),
 			parentId: Schema.OptionFromUndefinedOr(FolderId),
 		}),
 		error: Schema.Union(NotFoundError, InternalError, PolicyDeniedError),
diff --git a/packages/web-domain/src/Space.ts b/packages/web-domain/src/Space.ts
index 4091861708..2f7926249f 100644
--- a/packages/web-domain/src/Space.ts
+++ b/packages/web-domain/src/Space.ts
@@ -1,4 +1,8 @@
 import { Schema } from "effect";
+import { OrganisationId } from "./Organisation.ts";
 
-export const SpaceId = Schema.String; // TODO: .pipe(Schema.brand("SpaceId"));
-export type SpaceId = typeof SpaceId.Type;
+export const SpaceId = Schema.String.pipe(Schema.brand("SpaceId"));
+export type SpaceId = typeof SpaceIdOrOrganisationId.Type;
+
+export const SpaceIdOrOrganisationId = Schema.Union(SpaceId, OrganisationId);
+export type SpaceIdOrOrganisationId = typeof SpaceIdOrOrganisationId.Type;