diff --git a/apps/hash-ai-worker-ts/scripts/flow-scenarios/run-flow-scenario.ts b/apps/hash-ai-worker-ts/scripts/flow-scenarios/run-flow-scenario.ts
index fb4fadd1b0c..3da8ca5296e 100644
--- a/apps/hash-ai-worker-ts/scripts/flow-scenarios/run-flow-scenario.ts
+++ b/apps/hash-ai-worker-ts/scripts/flow-scenarios/run-flow-scenario.ts
@@ -294,7 +294,7 @@ const getUserFlowDefinitionId = (
 ) => uuidv5(userId, scenarioFlowDefinitionId) as EntityUuid;
 
 /**
- * Runs load their definition from the `Flow Definition` entity whose uuid is the definition's id. Migrations only
+ * Runs load their definition from its `Flow Definition` entity, in the user's web here. Migrations only
  * seed the flows HASH provides, so the scenario's definition is written to the user's web: created if it doesn't
  * exist, and updated if it differs, like `seedFlowDefinitions` does for seeded flows.
  */
@@ -318,7 +318,10 @@ const ensureFlowDefinitionEntity = async ({
   const properties = mapFlowDefinitionToEntityProperties(flowDefinition);
 
   const existingEntity = await getFlowDefinitionEntityById({
-    flowDefinitionId,
+    flowDefinitionEntityId: entityIdFromComponents(
+      userId as WebId,
+      flowDefinitionId,
+    ),
     graphApiClient: graphApi,
     userAuthentication: authentication,
   });
@@ -446,6 +449,10 @@ const startRun = async ({
 }) => {
   const workflowId = generateUuid() as EntityUuid;
   const webId = userId as WebId;
+  const flowDefinitionEntityId = entityIdFromComponents(
+    webId,
+    flow.flowDefinitionId,
+  );
   const params: RunFlowWorkflowParams = {
     ...(taskQueue === "ai"
       ? {
@@ -460,7 +467,7 @@ const startRun = async ({
       : {}),
     flowRunEntityUuid: workflowId,
     flowInputs: inputs,
-    flowDefinitionId: flow.flowDefinitionId,
+    flowDefinitionEntityId,
     userAuthentication: { actorId: userId },
     webId,
   };
@@ -469,7 +476,7 @@ const startRun = async ({
     taskQueue,
     args: [params],
     memo: {
-      flowDefinitionId: flow.flowDefinitionId,
+      flowDefinitionEntityId,
       userAccountId: userId,
       webId,
     },
@@ -902,7 +909,10 @@ const main = async () => {
     const workflowError = await workflowErrorWhenClosed;
 
     const flowRun = await getFlowRunFromTemporalWorkflowId({
-      flowDefinitionId,
+      flowDefinitionEntityId: entityIdFromComponents(
+        userId as WebId,
+        flowDefinitionId,
+      ),
       flowRunEntityId: entityIdFromComponents(userId as WebId, workflowId),
       name: flowDefinition.name,
       temporalClient: client,
diff --git a/apps/hash-ai-worker-ts/src/activities/flow-activities/generate-flow-run-name-activity.ts b/apps/hash-ai-worker-ts/src/activities/flow-activities/generate-flow-run-name-activity.ts
index 01df5f7e3dd..7df0be988b1 100644
--- a/apps/hash-ai-worker-ts/src/activities/flow-activities/generate-flow-run-name-activity.ts
+++ b/apps/hash-ai-worker-ts/src/activities/flow-activities/generate-flow-run-name-activity.ts
@@ -1,6 +1,7 @@
 import {
   flowDefinitionIds,
-  isGoalFlowDefinitionId,
+  isGoalFlowDefinitionEntityId,
+  isHashFlowDefinitionEntityId,
 } from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
 
 import { getFlowContext } from "../shared/get-flow-context.js";
@@ -9,7 +10,7 @@ import { getTextContentFromLlmMessage } from "../shared/get-llm-response/llm-mes
 import { graphApiClient } from "../shared/graph-api-client.js";
 
 import type { UsageTrackingParams } from "../shared/get-llm-response.js";
-import type { EntityUuid } from "@blockprotocol/type-system";
+import type { EntityId, EntityUuid } from "@blockprotocol/type-system";
 import type {
   AutomaticInferenceInputName,
   ManualInferenceInputName,
@@ -25,7 +26,7 @@ import type {
 
 type GenerateFlowRunNameActivityParams = {
   flowDefinition: FlowDefinition<FlowActionDefinitionId>;
-  flowDefinitionId: EntityUuid;
+  flowDefinitionEntityId: EntityId;
   flowInputs: FlowInputValues;
 };
 
@@ -95,13 +96,14 @@ const inputKindsToIgnore: PayloadKind[] = [
 export const generateFlowRunName = async (
   params: GenerateFlowRunNameActivityParams,
 ) => {
-  const { flowDefinition, flowDefinitionId, flowInputs } = params;
+  const { flowDefinition, flowDefinitionEntityId, flowInputs } = params;
+
+  const isHashFlow = (flowDefinitionId: EntityUuid) =>
+    isHashFlowDefinitionEntityId(flowDefinitionEntityId, flowDefinitionId);
 
   if (
-    [
-      flowDefinitionIds.automaticBrowserInference,
-      flowDefinitionIds.manualBrowserInference,
-    ].includes(flowDefinitionId)
+    isHashFlow(flowDefinitionIds.automaticBrowserInference) ||
+    isHashFlow(flowDefinitionIds.manualBrowserInference)
   ) {
     const webPage = flowInputs[
       "visitedWebPage" satisfies AutomaticInferenceInputName &
@@ -113,7 +115,7 @@ export const generateFlowRunName = async (
     }
 
     return `${
-      flowDefinitionId === flowDefinitionIds.automaticBrowserInference
+      isHashFlow(flowDefinitionIds.automaticBrowserInference)
         ? "Auto-analyze"
         : "Analyze"
     } webpage: ${webPage.url}`;
@@ -130,7 +132,7 @@ export const generateFlowRunName = async (
     webId,
   };
 
-  if (isGoalFlowDefinitionId(flowDefinitionId)) {
+  if (isGoalFlowDefinitionEntityId(flowDefinitionEntityId)) {
     const researchBrief = flowInputs[
       "researchGuidance" satisfies GoalFlowInputName
     ]?.value as PayloadKindValues["Text"] | undefined;
diff --git a/apps/hash-ai-worker-ts/src/shared/testing-utilities/mock-get-flow-context.ts b/apps/hash-ai-worker-ts/src/shared/testing-utilities/mock-get-flow-context.ts
index 013f57a5cfe..e34b38abb68 100644
--- a/apps/hash-ai-worker-ts/src/shared/testing-utilities/mock-get-flow-context.ts
+++ b/apps/hash-ai-worker-ts/src/shared/testing-utilities/mock-get-flow-context.ts
@@ -1,6 +1,7 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { vi } from "vitest";
 
+import { entityIdFromComponents } from "@blockprotocol/type-system";
 import { HashEntity } from "@local/hash-graph-sdk/entity";
 import { mapFlowRunToEntityProperties } from "@local/hash-isomorphic-utils/flows/mappings";
 import { generateUuid } from "@local/hash-isomorphic-utils/generate-uuid";
@@ -34,7 +35,10 @@ const createDummyFlow = async (params: { actorId: ActorEntityUuid }) => {
   const dummyFlowRunProperties = mapFlowRunToEntityProperties({
     name: "dummy-name",
     flowInputs: {},
-    flowDefinitionId: generateUuid() as EntityUuid,
+    flowDefinitionEntityId: entityIdFromComponents(
+      actorId as WebId,
+      generateUuid() as EntityUuid,
+    ),
     steps: [],
     temporalWorkflowId: generateUuid(),
   });
@@ -132,7 +136,10 @@ vi.mock("@local/hash-backend-utils/temporal", async (importOriginal) => {
                   },
                 },
               },
-              flowDefinitionId: generateUuid() as EntityUuid,
+              flowDefinitionEntityId: entityIdFromComponents(
+                aliceUserAccountId as WebId,
+                generateUuid() as EntityUuid,
+              ),
               flowInputs: {},
               webId: aliceUserAccountId,
               userAuthentication: {
diff --git a/apps/hash-ai-worker-ts/src/workflows/run-flow-workflow.ts b/apps/hash-ai-worker-ts/src/workflows/run-flow-workflow.ts
index 714b026c3d8..70478c1656b 100644
--- a/apps/hash-ai-worker-ts/src/workflows/run-flow-workflow.ts
+++ b/apps/hash-ai-worker-ts/src/workflows/run-flow-workflow.ts
@@ -10,7 +10,7 @@ import { heartbeatTimeoutSeconds } from "../shared/heartbeats.js";
 import { setQueryAndSignalHandlers } from "./run-flow-workflow/set-query-and-signal-handlers.js";
 
 import type { createFlowActivities } from "../activities/flow-activities.js";
-import type { EntityUuid } from "@blockprotocol/type-system";
+import type { EntityId } from "@blockprotocol/type-system";
 import type { ProxyFlowActivity } from "@local/hash-backend-utils/flows";
 import type {
   RunAiFlowWorkflowParams,
@@ -84,7 +84,7 @@ const proxyFlowActivity: ProxyFlowActivity<
 
 const generateFlowRunName = (params: {
   flowDefinition: FlowDefinition;
-  flowDefinitionId: EntityUuid;
+  flowDefinitionEntityId: EntityId;
   flowInputs: FlowInputValues;
 }) => {
   const { generateFlowRunName: generateFlowRunNameActivity } = proxyActivities<
diff --git a/apps/hash-api/src/ai/infer-entities-websocket/handle-infer-entities-request.ts b/apps/hash-api/src/ai/infer-entities-websocket/handle-infer-entities-request.ts
index e556d53c9c1..8f1b9263577 100644
--- a/apps/hash-api/src/ai/infer-entities-websocket/handle-infer-entities-request.ts
+++ b/apps/hash-api/src/ai/infer-entities-websocket/handle-infer-entities-request.ts
@@ -1,5 +1,9 @@
 import { getFlowRuns } from "@local/hash-backend-utils/flows";
-import { flowDefinitionIds } from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
+import { getHashWebId } from "@local/hash-backend-utils/flows/shared/get-hash-web-id";
+import {
+  flowDefinitionIds,
+  generateHashFlowDefinitionEntityId,
+} from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
 
 import { FlowRunStatus } from "../../graphql/api-types.gen";
 
@@ -41,20 +45,28 @@ export const handleInferEntitiesRequest = async ({
     payload: { webId, ...flowInputs },
   } = message;
 
-  const flowDefinitionId =
+  const hashWebId = await getHashWebId(graphApiClient, {
+    actorId: user.accountId,
+  });
+
+  const flowDefinitionEntityId = generateHashFlowDefinitionEntityId(
+    hashWebId,
     message.type === "manual-inference-request"
       ? flowDefinitionIds.manualBrowserInference
-      : flowDefinitionIds.automaticBrowserInference;
+      : flowDefinitionIds.automaticBrowserInference,
+  );
 
   if (message.type === "automatic-inference-request") {
     const openFlowRuns = await getFlowRuns({
       authentication: { actorId: user.accountId },
       filters: {
         executionStatus: FlowRunStatus.Running,
-        flowDefinitionIds: [
+        flowDefinitionEntityIds: [
           flowDefinitionIds.automaticBrowserInference,
           flowDefinitionIds.manualBrowserInference,
-        ],
+        ].map((flowDefinitionId) =>
+          generateHashFlowDefinitionEntityId(hashWebId, flowDefinitionId),
+        ),
       },
       graphApiClient,
       includeDetails: true,
@@ -91,7 +103,7 @@ export const handleInferEntitiesRequest = async ({
             },
           },
         },
-        flowDefinitionId,
+        flowDefinitionEntityId,
         flowInputs,
         /* So that the run's entity id can be worked out from the request, as the browser plugin does. */
         flowRunEntityUuid: requestUuid as EntityUuid,
@@ -100,7 +112,7 @@ export const handleInferEntitiesRequest = async ({
       },
     ],
     memo: {
-      flowDefinitionId,
+      flowDefinitionEntityId,
       userAccountId: user.accountId,
       webId,
     },
diff --git a/apps/hash-api/src/graph/knowledge/system-types/flow-schedule.ts b/apps/hash-api/src/graph/knowledge/system-types/flow-schedule.ts
index f34194ca172..c22294b7c8d 100644
--- a/apps/hash-api/src/graph/knowledge/system-types/flow-schedule.ts
+++ b/apps/hash-api/src/graph/knowledge/system-types/flow-schedule.ts
@@ -39,10 +39,7 @@ const isEntityFlowScheduleEntity = (
   );
 
 export const createFlowSchedule: ImpureGraphFunction<
-  CreateFlowScheduleInput & {
-    /** The `Flow Definition` entity the schedule starts runs of. */
-    flowDefinitionEntityId: EntityId;
-  },
+  CreateFlowScheduleInput,
   Promise<HashEntity<FlowSchedule>>
 > = async (context, authentication, params) => {
   const {
diff --git a/apps/hash-api/src/graphql/resolvers/flows/flow-schedule.ts b/apps/hash-api/src/graphql/resolvers/flows/flow-schedule.ts
index 2f9f87ef262..f12f3e1140b 100644
--- a/apps/hash-api/src/graphql/resolvers/flows/flow-schedule.ts
+++ b/apps/hash-api/src/graphql/resolvers/flows/flow-schedule.ts
@@ -43,11 +43,11 @@ export const createFlowScheduleResolver: ResolverFn<
   const context = graphQLContextToImpureGraphContext(graphQLContext);
   const { authentication } = graphQLContext;
 
-  const { flowDefinitionId } = input;
+  const { flowDefinitionEntityId } = input;
 
-  const { flowDefinitionEntity, flowType } = await getRunnableFlowDefinition(
+  const { flowType } = await getRunnableFlowDefinition(
     graphQLContext,
-    flowDefinitionId,
+    flowDefinitionEntityId,
   );
 
   if (flowType === "ai" && !input.dataSources) {
@@ -56,10 +56,11 @@ export const createFlowScheduleResolver: ResolverFn<
 
   assertClientFlowInputs(input.flowInputs);
 
-  const schedule = await createFlowScheduleEntity(context, authentication, {
-    ...input,
-    flowDefinitionEntityId: flowDefinitionEntity.metadata.recordId.entityId,
-  });
+  const schedule = await createFlowScheduleEntity(
+    context,
+    authentication,
+    input,
+  );
 
   const props = simplifyProperties(schedule.properties);
   const scheduleId = extractEntityUuidFromEntityId(
@@ -72,7 +73,7 @@ export const createFlowScheduleResolver: ResolverFn<
     ...(flowType === "ai" && input.dataSources
       ? { dataSources: input.dataSources }
       : {}),
-    flowDefinitionId,
+    flowDefinitionEntityId,
     flowRunName: input.name,
     flowInputs: input.flowInputs,
     flowTriggerEntityId: schedule.metadata.recordId.entityId,
@@ -90,7 +91,7 @@ export const createFlowScheduleResolver: ResolverFn<
         taskQueue,
         args: [workflowParams],
         memo: {
-          flowDefinitionId,
+          flowDefinitionEntityId,
           userAccountId: user.accountId,
           webId: input.webId,
         },
diff --git a/apps/hash-api/src/graphql/resolvers/flows/get-flow-runs.ts b/apps/hash-api/src/graphql/resolvers/flows/get-flow-runs.ts
index 8d27ac2f0e2..19993be5047 100644
--- a/apps/hash-api/src/graphql/resolvers/flows/get-flow-runs.ts
+++ b/apps/hash-api/src/graphql/resolvers/flows/get-flow-runs.ts
@@ -24,12 +24,12 @@ export const getFlowRunsResolver: ResolverFn<
 
   const { authentication, dataSources, temporal } = context;
 
-  const { flowDefinitionIds, executionStatus, cursor, limit } = args;
+  const { flowDefinitionEntityIds, executionStatus, cursor, limit } = args;
 
   return await getFlowRuns({
     authentication,
     filters: {
-      flowDefinitionIds,
+      flowDefinitionEntityIds,
       executionStatus,
       cursor,
       limit,
diff --git a/apps/hash-api/src/graphql/resolvers/flows/shared/get-runnable-flow-definition.ts b/apps/hash-api/src/graphql/resolvers/flows/shared/get-runnable-flow-definition.ts
index 85a9df34dd1..d116dd1e064 100644
--- a/apps/hash-api/src/graphql/resolvers/flows/shared/get-runnable-flow-definition.ts
+++ b/apps/hash-api/src/graphql/resolvers/flows/shared/get-runnable-flow-definition.ts
@@ -5,7 +5,7 @@ import { getFlowDefinitionFromEntity } from "@local/hash-isomorphic-utils/flows/
 import * as GraphQLError from "../../../error";
 
 import type { LoggedInGraphQLContext } from "../../../context";
-import type { EntityUuid } from "@blockprotocol/type-system";
+import type { EntityId } from "@blockprotocol/type-system";
 
 /**
  * Loads a flow's definition from its `Flow Definition` entity, and checks that the user can run it.
@@ -15,19 +15,19 @@ import type { EntityUuid } from "@blockprotocol/type-system";
  */
 export const getRunnableFlowDefinition = async (
   graphQLContext: LoggedInGraphQLContext,
-  flowDefinitionId: EntityUuid,
+  flowDefinitionEntityId: EntityId,
 ) => {
   const { dataSources, authentication, user } = graphQLContext;
 
   const flowDefinitionEntity = await getFlowDefinitionEntityById({
-    flowDefinitionId,
+    flowDefinitionEntityId,
     graphApiClient: dataSources.graphApi,
     userAuthentication: authentication,
   });
 
   if (!flowDefinitionEntity) {
     throw GraphQLError.notFound(
-      `No flow definition with id ${flowDefinitionId} exists, or you can't view it`,
+      `No flow definition with id ${flowDefinitionEntityId} exists, or you can't view it`,
     );
   }
 
@@ -38,7 +38,7 @@ export const getRunnableFlowDefinition = async (
   } catch (error) {
     /* The definition is stored data, so an invalid one is a fault here, not in the request. */
     throw GraphQLError.internal(
-      `Flow definition ${flowDefinitionId} is invalid: ${(error as Error).message}`,
+      `Flow definition ${flowDefinitionEntityId} is invalid: ${(error as Error).message}`,
     );
   }
 
diff --git a/apps/hash-api/src/graphql/resolvers/flows/start-flow.ts b/apps/hash-api/src/graphql/resolvers/flows/start-flow.ts
index 0e5580ac104..7d473c12766 100644
--- a/apps/hash-api/src/graphql/resolvers/flows/start-flow.ts
+++ b/apps/hash-api/src/graphql/resolvers/flows/start-flow.ts
@@ -23,7 +23,7 @@ export const startFlow: ResolverFn<
   MutationStartFlowArgs
 > = async (
   _,
-  { dataSources, flowInputs, flowDefinitionId, webId },
+  { dataSources, flowInputs, flowDefinitionEntityId, webId },
   graphQLContext,
 ) => {
   const { temporal, user } = graphQLContext;
@@ -33,7 +33,7 @@ export const startFlow: ResolverFn<
    */
   const { flowType } = await getRunnableFlowDefinition(
     graphQLContext,
-    flowDefinitionId,
+    flowDefinitionEntityId,
   );
 
   assertClientFlowInputs(flowInputs);
@@ -48,7 +48,7 @@ export const startFlow: ResolverFn<
     ...(flowType === "ai" ? { dataSources } : {}),
     flowRunEntityUuid: workflowId,
     flowInputs,
-    flowDefinitionId,
+    flowDefinitionEntityId,
     userAuthentication: { actorId: user.accountId },
     webId,
   };
@@ -59,7 +59,7 @@ export const startFlow: ResolverFn<
     taskQueue: flowType,
     args: [params],
     memo: {
-      flowDefinitionId,
+      flowDefinitionEntityId,
       userAccountId: user.accountId,
       webId,
     },
diff --git a/apps/hash-api/src/graphql/resolvers/knowledge/file/create-file-from-url.ts b/apps/hash-api/src/graphql/resolvers/knowledge/file/create-file-from-url.ts
index 069a8641ebe..b5bbf15f73d 100644
--- a/apps/hash-api/src/graphql/resolvers/knowledge/file/create-file-from-url.ts
+++ b/apps/hash-api/src/graphql/resolvers/knowledge/file/create-file-from-url.ts
@@ -44,6 +44,7 @@ export const createFileFromUrl: ResolverFn<
   if (user.enabledFeatureFlags.includes("ai")) {
     await triggerPdfAnalysisWorkflow({
       entity,
+      graphApiClient: context.graphApi,
       temporalClient: temporal,
       userAccountId: user.accountId,
       webId: extractWebIdFromEntityId(entity.entityId),
diff --git a/apps/hash-api/src/graphql/resolvers/knowledge/file/request-file-upload.ts b/apps/hash-api/src/graphql/resolvers/knowledge/file/request-file-upload.ts
index bb422e189b0..d40ede68484 100644
--- a/apps/hash-api/src/graphql/resolvers/knowledge/file/request-file-upload.ts
+++ b/apps/hash-api/src/graphql/resolvers/knowledge/file/request-file-upload.ts
@@ -67,6 +67,7 @@ export const requestFileUpload: ResolverFn<
   if (user.enabledFeatureFlags.includes("ai")) {
     await triggerPdfAnalysisWorkflow({
       entity,
+      graphApiClient: context.graphApi,
       temporalClient: temporal,
       userAccountId: user.accountId,
       webId: extractWebIdFromEntityId(entity.entityId),
diff --git a/apps/hash-api/src/graphql/resolvers/knowledge/file/shared.ts b/apps/hash-api/src/graphql/resolvers/knowledge/file/shared.ts
index 7a09a7a4f8b..5fc99e0de20 100644
--- a/apps/hash-api/src/graphql/resolvers/knowledge/file/shared.ts
+++ b/apps/hash-api/src/graphql/resolvers/knowledge/file/shared.ts
@@ -1,8 +1,13 @@
-import { flowDefinitionIds } from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
+import { getHashWebId } from "@local/hash-backend-utils/flows/shared/get-hash-web-id";
+import {
+  flowDefinitionIds,
+  generateHashFlowDefinitionEntityId,
+} from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
 import { generateUuid } from "@local/hash-isomorphic-utils/generate-uuid";
 
 import type { Entity, UserId, WebId } from "@blockprotocol/type-system";
 import type { TemporalClient } from "@local/hash-backend-utils/temporal";
+import type { GraphApi } from "@local/hash-graph-client";
 import type {
   RunFlowWorkflowParams,
   RunFlowWorkflowResponse,
@@ -11,11 +16,13 @@ import type { File } from "@local/hash-isomorphic-utils/system-types/shared";
 
 export const triggerPdfAnalysisWorkflow = async ({
   entity,
+  graphApiClient,
   temporalClient,
   userAccountId,
   webId,
 }: {
   entity: Entity<File>;
+  graphApiClient: GraphApi;
   temporalClient: TemporalClient;
   userAccountId: UserId;
   webId: WebId;
@@ -31,6 +38,11 @@ export const triggerPdfAnalysisWorkflow = async ({
     return;
   }
 
+  const flowDefinitionEntityId = generateHashFlowDefinitionEntityId(
+    await getHashWebId(graphApiClient, { actorId: userAccountId }),
+    flowDefinitionIds.inferMetadataFromDocument,
+  );
+
   const params: RunFlowWorkflowParams = {
     dataSources: {
       files: { fileEntityIds: [] },
@@ -42,7 +54,7 @@ export const triggerPdfAnalysisWorkflow = async ({
         },
       },
     },
-    flowDefinitionId: flowDefinitionIds.inferMetadataFromDocument,
+    flowDefinitionEntityId,
     flowInputs: {
       fileEntityId: { kind: "EntityId", value: entityId },
     },
@@ -58,7 +70,7 @@ export const triggerPdfAnalysisWorkflow = async ({
     taskQueue: "ai",
     args: [params],
     memo: {
-      flowDefinitionId: flowDefinitionIds.inferMetadataFromDocument,
+      flowDefinitionEntityId,
       userAccountId,
       webId,
     },
diff --git a/apps/hash-frontend/src/graphql/queries/knowledge/flow.queries.ts b/apps/hash-frontend/src/graphql/queries/knowledge/flow.queries.ts
index ed1c80643b9..8e2dca1ee8c 100644
--- a/apps/hash-frontend/src/graphql/queries/knowledge/flow.queries.ts
+++ b/apps/hash-frontend/src/graphql/queries/knowledge/flow.queries.ts
@@ -3,13 +3,13 @@ import { gql } from "@apollo/client";
 export const startFlowMutation = gql`
   mutation startFlow(
     $dataSources: FlowDataSources
-    $flowDefinitionId: EntityUuid!
+    $flowDefinitionEntityId: EntityId!
     $flowInputs: FlowInputValues!
     $webId: WebId!
   ) {
     startFlow(
       dataSources: $dataSources
-      flowDefinitionId: $flowDefinitionId
+      flowDefinitionEntityId: $flowDefinitionEntityId
       flowInputs: $flowInputs
       webId: $webId
     )
diff --git a/apps/hash-frontend/src/pages/@/[shortname]/flows/[flow-def-id].page.tsx b/apps/hash-frontend/src/pages/@/[shortname]/flows/[flow-def-id].page.tsx
index ecafb83d3f8..677a5f2a844 100644
--- a/apps/hash-frontend/src/pages/@/[shortname]/flows/[flow-def-id].page.tsx
+++ b/apps/hash-frontend/src/pages/@/[shortname]/flows/[flow-def-id].page.tsx
@@ -1,9 +1,16 @@
 import { useRouter } from "next/router";
 
+import { entityIdFromComponents } from "@blockprotocol/type-system";
+
 import { getLayoutWithSidebar } from "../../../../shared/layout";
 import { FlowDefinitionsContextProvider } from "../../../shared/flow-definitions-context-provider";
 import { FlowRunsContextProvider } from "../../../shared/flow-runs-context-provider";
-import { FlowVisualizer } from "../shared/flow-visualizer";
+import { NotFound } from "../../../shared/not-found";
+import {
+  FlowRunVisualizerSkeleton,
+  FlowVisualizer,
+} from "../shared/flow-visualizer";
+import { useRouteNamespace } from "../shared/use-route-namespace";
 
 import type { NextPageWithLayout } from "../../../../shared/layout";
 import type { EntityUuid } from "@blockprotocol/type-system";
@@ -11,12 +18,23 @@ import type { EntityUuid } from "@blockprotocol/type-system";
 const FlowDefinitionPage: NextPageWithLayout = () => {
   const { query } = useRouter();
 
-  /** @todo replace with real uuid once flow definitions are stored in the db */
-  const routeFlowDefinitionId = query["flow-def-id"] as EntityUuid;
+  const routeFlowDefinitionUuid = query["flow-def-id"] as EntityUuid;
+
+  /* The path has the uuid of the definition's entity, and its shortname names the web the definition is in. */
+  const { loading, routeNamespace } = useRouteNamespace();
+
+  if (!routeNamespace) {
+    return loading ? <FlowRunVisualizerSkeleton /> : <NotFound />;
+  }
+
+  const flowDefinitionEntityId = entityIdFromComponents(
+    routeNamespace.webId,
+    routeFlowDefinitionUuid,
+  );
 
   return (
     <FlowDefinitionsContextProvider
-      selectedFlowDefinitionId={routeFlowDefinitionId}
+      selectedFlowDefinitionEntityId={flowDefinitionEntityId}
     >
       <FlowRunsContextProvider selectedFlowRunEntityId={null}>
         <FlowVisualizer />
diff --git a/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer.tsx b/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer.tsx
index 667db745d89..8d6bbbcb90f 100644
--- a/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer.tsx
+++ b/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer.tsx
@@ -11,7 +11,8 @@ import { deserializeSubgraph } from "@local/hash-graph-sdk/subgraph";
 import { actionDefinitions } from "@local/hash-isomorphic-utils/flows/action-definitions";
 import {
   flowDefinitionIds,
-  isGoalFlowDefinitionId,
+  isGoalFlowDefinitionEntityId,
+  isHashFlowDefinitionEntityId,
 } from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
 import { generateWorkerRunPath } from "@local/hash-isomorphic-utils/flows/frontend-paths";
 import {
@@ -63,12 +64,7 @@ import type {
   ProposedEntityOutput,
 } from "./flow-visualizer/shared/types";
 import type { EntityRootType, Subgraph } from "@blockprotocol/graph";
-import type {
-  EntityId,
-  EntityUuid,
-  Timestamp,
-  WebId,
-} from "@blockprotocol/type-system";
+import type { EntityId, Timestamp, WebId } from "@blockprotocol/type-system";
 import type { Filter } from "@local/hash-graph-client";
 import type { HashEntity } from "@local/hash-graph-sdk/entity";
 import type {
@@ -206,7 +202,7 @@ export const FlowVisualizer = () => {
   const {
     flowDefinitions,
     loading: flowDefinitionsLoading,
-    selectedFlowDefinitionId,
+    selectedFlowDefinitionEntityId,
   } = useFlowDefinitionsContext();
 
   const { selectedFlowRun } = useFlowRunsContext();
@@ -218,8 +214,8 @@ export const FlowVisualizer = () => {
     flowDefinition: flowOfSelectedRun,
     loading: flowOfSelectedRunLoading,
   } = useFlowDefinitionAtTime({
-    flowDefinitionId: selectedFlowRun
-      ? (selectedFlowRun.flowDefinitionId as EntityUuid)
+    flowDefinitionEntityId: selectedFlowRun
+      ? selectedFlowRun.flowDefinitionEntityId
       : null,
     timestamp: selectedFlowRun
       ? (selectedFlowRun.startedAt as Timestamp)
@@ -246,13 +242,13 @@ export const FlowVisualizer = () => {
       selectedFlowRun
         ? flowOfSelectedRun
         : flowDefinitions.find(
-            ({ flowDefinitionId }) =>
-              flowDefinitionId === selectedFlowDefinitionId,
+            ({ flowDefinitionEntityId }) =>
+              flowDefinitionEntityId === selectedFlowDefinitionEntityId,
           ),
     [
       flowDefinitions,
       flowOfSelectedRun,
-      selectedFlowDefinitionId,
+      selectedFlowDefinitionEntityId,
       selectedFlowRun,
     ],
   );
@@ -600,7 +596,7 @@ export const FlowVisualizer = () => {
 
         variables = {
           dataSources: selectedFlowRun.dataSources,
-          flowDefinitionId: selectedFlow.flowDefinitionId,
+          flowDefinitionEntityId: selectedFlow.flowDefinitionEntityId,
           flowInputs: selectedFlowRun.flowInputs,
           webId: selectedFlowRun.webId,
         };
@@ -617,7 +613,7 @@ export const FlowVisualizer = () => {
               enabled: true,
             },
           },
-          flowDefinitionId: selectedFlow.flowDefinitionId,
+          flowDefinitionEntityId: selectedFlow.flowDefinitionEntityId,
           flowInputs,
           webId,
         };
@@ -662,7 +658,7 @@ export const FlowVisualizer = () => {
       return <FlowRunVisualizerSkeleton />;
     }
 
-    if (selectedFlowDefinitionId) {
+    if (selectedFlowDefinitionEntityId) {
       /* The definition doesn't exist, or the user can't view it. */
       return <NotFound />;
     }
@@ -674,11 +670,16 @@ export const FlowVisualizer = () => {
     selectedFlowRun?.flowRunEntityId ?? "definition"
   }`;
 
-  const isRunnableFromHere = !unrunnableDefinitionIds.includes(
-    selectedFlow.flowDefinitionId,
+  const isRunnableFromHere = !unrunnableDefinitionIds.some((flowDefinitionId) =>
+    isHashFlowDefinitionEntityId(
+      selectedFlow.flowDefinitionEntityId,
+      flowDefinitionId,
+    ),
   );
 
-  const isGoal = isGoalFlowDefinitionId(selectedFlow.flowDefinitionId);
+  const isGoal = isGoalFlowDefinitionEntityId(
+    selectedFlow.flowDefinitionEntityId,
+  );
 
   return (
     <>
@@ -688,7 +689,7 @@ export const FlowVisualizer = () => {
           open={showDag}
           onClose={() => setShowDag(false)}
           selectedFlowDefinition={selectedFlowDefinition}
-          flowDefinitionId={selectedFlow.flowDefinitionId}
+          flowDefinitionEntityId={selectedFlow.flowDefinitionEntityId}
         />
       )}
       <Stack sx={{ height: containerHeight }}>
@@ -696,7 +697,7 @@ export const FlowVisualizer = () => {
           <RunFlowModal
             key={selectedFlowDefinition.name}
             flowDefinition={selectedFlowDefinition}
-            flowDefinitionId={selectedFlow.flowDefinitionId}
+            flowDefinitionEntityId={selectedFlow.flowDefinitionEntityId}
             open={showRunModal}
             onClose={() => setShowRunModal(false)}
             onScheduleCreated={() => {
@@ -731,7 +732,7 @@ export const FlowVisualizer = () => {
         >
           {selectedFlowRun ? (
             <FlowRunSidebar
-              flowDefinitionId={selectedFlow.flowDefinitionId}
+              flowDefinitionEntityId={selectedFlow.flowDefinitionEntityId}
               flowRunEntityId={selectedFlowRun.flowRunEntityId}
               flowScheduleId={selectedFlowRun.flowScheduleId ?? null}
               graph={graph}
diff --git a/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/dag-slide.tsx b/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/dag-slide.tsx
index ef393b6c4a3..406528017e2 100644
--- a/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/dag-slide.tsx
+++ b/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/dag-slide.tsx
@@ -1,13 +1,13 @@
 import { Backdrop, Box, Slide, Stack } from "@mui/material";
 
 import { IconButton, XMarkRegularIcon } from "@hashintel/design-system";
-import { isGoalFlowDefinitionId } from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
+import { isGoalFlowDefinitionEntityId } from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
 
 import { DAG } from "./dag";
 import { Topbar } from "./topbar";
 
 import type { EdgesAndNodes } from "./shared/types";
-import type { EntityUuid } from "@blockprotocol/type-system";
+import type { EntityId } from "@blockprotocol/type-system";
 import type {
   FlowActionDefinitionId,
   FlowDefinition,
@@ -18,7 +18,7 @@ type DagSlideProps = {
   open: boolean;
   onClose: () => void;
   selectedFlowDefinition: FlowDefinition<FlowActionDefinitionId>;
-  flowDefinitionId: EntityUuid;
+  flowDefinitionEntityId: EntityId;
 };
 
 export const DagSlide = ({
@@ -26,9 +26,9 @@ export const DagSlide = ({
   open,
   onClose,
   selectedFlowDefinition,
-  flowDefinitionId,
+  flowDefinitionEntityId,
 }: DagSlideProps) => {
-  const isGoal = isGoalFlowDefinitionId(flowDefinitionId);
+  const isGoal = isGoalFlowDefinitionEntityId(flowDefinitionEntityId);
 
   return (
     <Backdrop
diff --git a/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/flow-run-sidebar.tsx b/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/flow-run-sidebar.tsx
index 1ac052f4625..de8aa2cfaa3 100644
--- a/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/flow-run-sidebar.tsx
+++ b/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/flow-run-sidebar.tsx
@@ -7,7 +7,7 @@ import {
   ClockRegularIcon,
   IconButton,
 } from "@hashintel/design-system";
-import { isGoalFlowDefinitionId } from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
+import { isGoalFlowDefinitionEntityId } from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
 
 import { Link } from "../../../../../shared/ui/link";
 import { useFlowRunsContext } from "../../../../shared/flow-runs-context";
@@ -38,7 +38,7 @@ const SidebarSection = ({ children }: PropsWithChildren) => (
 );
 
 type FlowRunSidebarProps = {
-  flowDefinitionId: EntityUuid;
+  flowDefinitionEntityId: EntityId;
   flowRunEntityId: EntityId;
   flowScheduleId: EntityUuid | null;
   graph: EdgesAndNodes;
@@ -47,7 +47,7 @@ type FlowRunSidebarProps = {
 };
 
 export const FlowRunSidebar = ({
-  flowDefinitionId,
+  flowDefinitionEntityId,
   flowRunEntityId,
   flowScheduleId,
   graph,
@@ -86,7 +86,9 @@ export const FlowRunSidebar = ({
         <Stack direction="row" alignItems="center" gap={0.75}>
           <SectionLabel
             text={
-              isGoalFlowDefinitionId(flowDefinitionId) ? "Goal" : "Description"
+              isGoalFlowDefinitionEntityId(flowDefinitionEntityId)
+                ? "Goal"
+                : "Description"
             }
           />
           {flowScheduleId && (
diff --git a/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/outputs.tsx b/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/outputs.tsx
index 40c3b409f03..67123158576 100644
--- a/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/outputs.tsx
+++ b/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/outputs.tsx
@@ -9,7 +9,7 @@ import {
 } from "@blockprotocol/type-system";
 import { CheckRegularIcon, IconButton } from "@hashintel/design-system";
 import { HashEntity } from "@local/hash-graph-sdk/entity";
-import { isGoalFlowDefinitionId } from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
+import { isGoalFlowDefinitionEntityId } from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
 import { currentTimeInstantTemporalAxes } from "@local/hash-isomorphic-utils/graph-queries";
 
 import { getClosedMultiEntityTypesQuery } from "../../../../../graphql/queries/ontology/entity-type.queries";
@@ -33,7 +33,6 @@ import type { EntityRootType, Subgraph } from "@blockprotocol/graph";
 import type {
   EntityEditionId,
   EntityId,
-  EntityUuid,
   LeftClosedTemporalInterval,
   Timestamp,
   VersionedUrl,
@@ -261,7 +260,7 @@ export const Outputs = ({
 
   const hasClaims =
     !!selectedFlowRun &&
-    isGoalFlowDefinitionId(selectedFlowRun.flowDefinitionId as EntityUuid);
+    isGoalFlowDefinitionEntityId(selectedFlowRun.flowDefinitionEntityId);
 
   const hasEntities =
     persistedEntitiesMetadata.length > 0 || proposedEntities.length > 0;
diff --git a/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/run-flow-modal.tsx b/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/run-flow-modal.tsx
index c1ab7689fa1..c16fd458317 100644
--- a/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/run-flow-modal.tsx
+++ b/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/run-flow-modal.tsx
@@ -24,7 +24,7 @@ import type {
   CreateFlowScheduleMutationVariables,
 } from "../../../../../graphql/api-types.gen";
 import type { FormState, LocalPayload } from "./run-flow-modal/types";
-import type { EntityUuid, WebId } from "@blockprotocol/type-system";
+import type { EntityId, EntityUuid, WebId } from "@blockprotocol/type-system";
 import type { CreateFlowScheduleInput } from "@local/hash-isomorphic-utils/flows/schedule-types";
 import type {
   FlowActionDefinitionId,
@@ -116,7 +116,7 @@ const intervalUnitToMs: Record<IntervalUnit, number> = {
 
 type RunFlowModalProps = {
   flowDefinition: FlowDefinition<FlowActionDefinitionId>;
-  flowDefinitionId: EntityUuid;
+  flowDefinitionEntityId: EntityId;
   onClose: () => void;
   open: boolean;
   runFlow: (flowInputs: FlowInputValues, webId: WebId) => Promise<void>;
@@ -125,7 +125,7 @@ type RunFlowModalProps = {
 
 export const RunFlowModal = ({
   flowDefinition,
-  flowDefinitionId,
+  flowDefinitionEntityId,
   open,
   onClose,
   runFlow,
@@ -218,7 +218,7 @@ export const RunFlowModal = ({
 
         const scheduleInput: CreateFlowScheduleInput = {
           name: scheduleName || `${flowDefinition.name} schedule`,
-          flowDefinitionId,
+          flowDefinitionEntityId,
           webId,
           scheduleSpec: {
             type: "interval",
diff --git a/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/topbar.tsx b/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/topbar.tsx
index 8f2dff42218..2ff90ed1940 100644
--- a/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/topbar.tsx
+++ b/apps/hash-frontend/src/pages/@/[shortname]/shared/flow-visualizer/topbar.tsx
@@ -10,6 +10,7 @@ import { format } from "date-fns";
 import { useRouter } from "next/router";
 import { useCallback, useMemo, useState } from "react";
 
+import { extractWebIdFromEntityId } from "@blockprotocol/type-system";
 import {
   AngleRightRegularIcon,
   PlaySolidIcon,
@@ -35,6 +36,7 @@ import type {
   CancelFlowMutationVariables,
   FlowRun,
 } from "../../../../../graphql/api-types.gen";
+import type { EntityId } from "@blockprotocol/type-system";
 import type { SvgIconProps, SxProps, Theme } from "@mui/material";
 import type { FunctionComponent } from "react";
 
@@ -166,7 +168,7 @@ export const Topbar = ({
 
   const [cancelling, setCancelling] = useState(false);
 
-  const { flowDefinitions, selectedFlowDefinitionId } =
+  const { flowDefinitions, selectedFlowDefinitionEntityId } =
     useFlowDefinitionsContext();
 
   const { flowRuns, selectedFlowRunEntityId, selectedFlowRun } =
@@ -200,16 +202,25 @@ export const Topbar = ({
 
   const getOwner = useGetOwnerForEntity();
 
+  /** A definition's page is under the shortname of the web the definition is in. */
+  const getFlowDefinitionPath = (flowDefinitionEntityId: EntityId) =>
+    generateFlowDefinitionPath({
+      shortname: getOwner({
+        webId: extractWebIdFromEntityId(flowDefinitionEntityId),
+      }).shortname,
+      flowDefinitionEntityId,
+    });
+
   const runOptions = useMemo(
     () =>
       flowRuns.filter(
-        (run) => run.flowDefinitionId === selectedFlowDefinitionId,
+        (run) => run.flowDefinitionEntityId === selectedFlowDefinitionEntityId,
       ),
-    [flowRuns, selectedFlowDefinitionId],
+    [flowRuns, selectedFlowDefinitionEntityId],
   );
 
   const selectedFlowDefinition = flowDefinitions.find(
-    (flow) => flow.flowDefinitionId === selectedFlowDefinitionId,
+    (flow) => flow.flowDefinitionEntityId === selectedFlowDefinitionEntityId,
   );
 
   return (
@@ -256,25 +267,22 @@ export const Topbar = ({
           ) : (
             <Select
               selectSx={selectSx}
-              value={selectedFlowDefinitionId ?? "none"}
+              value={selectedFlowDefinitionEntityId ?? "none"}
               onChange={(event) => {
-                /**
-                 * @todo update this to use the flow definition's uuid when stored in the db
-                 *    also then needs to take account of the correct namespace, which might be different from the
-                 *   current
-                 */
-                void push(
-                  generateFlowDefinitionPath({
-                    shortname: "hash",
-                    flowDefinitionId: event.target.value,
-                  }),
+                const flow = flowDefinitions.find(
+                  ({ flowDefinitionEntityId }) =>
+                    flowDefinitionEntityId === event.target.value,
                 );
+
+                if (flow) {
+                  void push(getFlowDefinitionPath(flow.flowDefinitionEntityId));
+                }
               }}
             >
               {flowDefinitions.map((flow) => (
                 <MenuItem
-                  key={flow.flowDefinitionId}
-                  value={flow.flowDefinitionId}
+                  key={flow.flowDefinitionEntityId}
+                  value={flow.flowDefinitionEntityId}
                 >
                   {flow.flowDefinition.name}
                 </MenuItem>
@@ -297,12 +305,11 @@ export const Topbar = ({
                   const value = event.target.value;
 
                   if (value === "none") {
-                    void push(
-                      generateFlowDefinitionPath({
-                        shortname: "hash",
-                        flowDefinitionId: selectedFlowDefinitionId ?? "none",
-                      }),
-                    );
+                    if (selectedFlowDefinitionEntityId) {
+                      void push(
+                        getFlowDefinitionPath(selectedFlowDefinitionEntityId),
+                      );
+                    }
                     return;
                   }
 
diff --git a/apps/hash-frontend/src/pages/@/[shortname]/workers/[run-id].page.tsx b/apps/hash-frontend/src/pages/@/[shortname]/workers/[run-id].page.tsx
index 755f8b38a51..3adb2a30d37 100644
--- a/apps/hash-frontend/src/pages/@/[shortname]/workers/[run-id].page.tsx
+++ b/apps/hash-frontend/src/pages/@/[shortname]/workers/[run-id].page.tsx
@@ -24,7 +24,7 @@ const WorkerFlowDefinitionResolver = () => {
 
   return (
     <FlowDefinitionsContextProvider
-      selectedFlowDefinitionId={selectedFlowRun.flowDefinitionId as EntityUuid}
+      selectedFlowDefinitionEntityId={selectedFlowRun.flowDefinitionEntityId}
     >
       <FlowVisualizer />
     </FlowDefinitionsContextProvider>
diff --git a/apps/hash-frontend/src/pages/dashboard/hooks/use-dashboard-item-config.ts b/apps/hash-frontend/src/pages/dashboard/hooks/use-dashboard-item-config.ts
index bb77e7c4606..a5abf60f88c 100644
--- a/apps/hash-frontend/src/pages/dashboard/hooks/use-dashboard-item-config.ts
+++ b/apps/hash-frontend/src/pages/dashboard/hooks/use-dashboard-item-config.ts
@@ -12,6 +12,7 @@ import { systemPropertyTypes } from "@local/hash-isomorphic-utils/ontology-type-
 import { FlowRunStatus } from "../../../graphql/api-types.gen";
 import { updateEntityMutation } from "../../../graphql/queries/knowledge/entity.queries";
 import { startFlowMutation } from "../../../graphql/queries/knowledge/flow.queries";
+import { useGenerateHashFlowDefinitionEntityId } from "../../shared/use-hash-flows";
 
 import type {
   FlowRun,
@@ -205,6 +206,9 @@ export const useDashboardItemConfig = ({
     UpdateEntityMutationVariables
   >(updateEntityMutation);
 
+  const generateHashFlowDefinitionEntityId =
+    useGenerateHashFlowDefinitionEntityId();
+
   const [startFlow] = useMutation<
     StartFlowMutation,
     StartFlowMutationVariables
@@ -600,7 +604,9 @@ export const useDashboardItemConfig = ({
       // Start the flow
       const { data } = await startFlow({
         variables: {
-          flowDefinitionId: flowDefinitionIds.configureDashboardItem,
+          flowDefinitionEntityId: generateHashFlowDefinitionEntityId(
+            flowDefinitionIds.configureDashboardItem,
+          ),
           flowInputs: {
             userGoal: {
               kind: "Text",
@@ -664,6 +670,7 @@ export const useDashboardItemConfig = ({
     onGenerationStarted,
     onComplete,
     markGenerationFailed,
+    generateHashFlowDefinitionEntityId,
   ]);
 
   const refineConfiguration = useCallback(
@@ -718,7 +725,9 @@ export const useDashboardItemConfig = ({
 
         const { data } = await startFlow({
           variables: {
-            flowDefinitionId: flowDefinitionIds.refineDashboardItem,
+            flowDefinitionEntityId: generateHashFlowDefinitionEntityId(
+              flowDefinitionIds.refineDashboardItem,
+            ),
             flowInputs: {
               userGoal: { kind: "Text", value: initialGoal },
               refinementInstruction: {
@@ -789,6 +798,7 @@ export const useDashboardItemConfig = ({
       initialValues,
       markGenerationFailed,
       onGenerationStarted,
+      generateHashFlowDefinitionEntityId,
       setError,
       startFlow,
       startPolling,
diff --git a/apps/hash-frontend/src/pages/flows.page.tsx b/apps/hash-frontend/src/pages/flows.page.tsx
index bc221aa18ce..eba33acc05a 100644
--- a/apps/hash-frontend/src/pages/flows.page.tsx
+++ b/apps/hash-frontend/src/pages/flows.page.tsx
@@ -3,9 +3,10 @@ import { formatDistanceToNowStrict } from "date-fns";
 import { memo, useMemo, useState } from "react";
 
 import { InfinityLightIcon } from "@hashintel/design-system";
-import { isGoalFlowDefinitionId } from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
+import { isGoalFlowDefinitionEntityId } from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
 import { generateFlowDefinitionPath } from "@local/hash-isomorphic-utils/flows/frontend-paths";
 
+import { useGetOwnerForEntity } from "../components/hooks/use-get-owner-for-entity";
 import { getLayoutWithSidebar } from "../shared/layout";
 import { Link } from "../shared/ui/link";
 import { WorkersHeader } from "../shared/workers-header";
@@ -28,6 +29,7 @@ import type {
   VirtualizedTableRow,
 } from "./shared/virtualized-table";
 import type { VirtualizedTableSort } from "./shared/virtualized-table/header/sort";
+import type { EntityId } from "@blockprotocol/type-system";
 import type { Subtype } from "@local/advanced-types/subtype";
 
 type FieldId = "web" | "name" | "description" | "lastRunStartedAt";
@@ -69,14 +71,15 @@ type FlowSummary = Subtype<
       isOrg: boolean;
     };
     name: string;
-    uuid: string;
+    flowDefinitionEntityId: EntityId;
     description: string;
     lastRunStartedAt: string | null;
   }
 >;
 
 const TableRow = memo(({ flowSummary }: { flowSummary: FlowSummary }) => {
-  const { web, name, uuid, description, lastRunStartedAt } = flowSummary;
+  const { web, name, flowDefinitionEntityId, description, lastRunStartedAt } =
+    flowSummary;
 
   return (
     <>
@@ -87,7 +90,7 @@ const TableRow = memo(({ flowSummary }: { flowSummary: FlowSummary }) => {
         <Link
           href={generateFlowDefinitionPath({
             shortname: web.shortname,
-            flowDefinitionId: uuid,
+            flowDefinitionEntityId,
           })}
           sx={{
             display: "block",
@@ -134,16 +137,19 @@ const FlowsPageContent = () => {
 
   const { flowRuns } = useFlowRunsContext();
 
+  const getOwner = useGetOwnerForEntity();
+
   const flowDefinitionRows = useMemo<VirtualizedTableRow<FlowSummary>[]>(() => {
     const rowData: VirtualizedTableRow<FlowSummary>[] = allFlowDefinitions
       .filter(
-        ({ flowDefinitionId }) => !isGoalFlowDefinitionId(flowDefinitionId),
+        ({ flowDefinitionEntityId }) =>
+          !isGoalFlowDefinitionEntityId(flowDefinitionEntityId),
       )
-      .map(({ flowDefinitionId, flowDefinition }) => {
+      .map(({ flowDefinitionEntityId, flowDefinition }) => {
         let lastRunStartedAt = null;
         for (const flowRun of flowRuns) {
           if (
-            flowRun.flowDefinitionId === flowDefinitionId &&
+            flowRun.flowDefinitionEntityId === flowDefinitionEntityId &&
             (!lastRunStartedAt || flowRun.startedAt > lastRunStartedAt)
           ) {
             lastRunStartedAt = flowRun.startedAt;
@@ -151,16 +157,17 @@ const FlowsPageContent = () => {
         }
 
         return {
-          id: flowDefinitionId,
+          id: flowDefinitionEntityId,
           data: {
             web: {
               avatarUrl: "/hash-logo-black.png",
               name: "HASH",
-              shortname: "hash",
+              shortname: getOwner({ entityId: flowDefinitionEntityId })
+                .shortname,
               isOrg: true,
             },
             name: flowDefinition.name,
-            uuid: flowDefinitionId,
+            flowDefinitionEntityId,
             description: flowDefinition.description,
             lastRunStartedAt,
           },
@@ -179,7 +186,7 @@ const FlowsPageContent = () => {
         (a.data[field] ?? "").localeCompare(b.data[field] ?? "") * direction
       );
     });
-  }, [allFlowDefinitions, flowRuns, sort]);
+  }, [allFlowDefinitions, flowRuns, getOwner, sort]);
 
   const tableHeight = Math.min(
     600,
@@ -216,7 +223,7 @@ const FlowsPageContent = () => {
 
 const FlowsPage: NextPageWithLayout = () => {
   return (
-    <FlowDefinitionsContextProvider selectedFlowDefinitionId={null}>
+    <FlowDefinitionsContextProvider selectedFlowDefinitionEntityId={null}>
       <FlowRunsContextProvider selectedFlowRunEntityId={null}>
         <FlowsPageContent />
       </FlowRunsContextProvider>
diff --git a/apps/hash-frontend/src/pages/goals.page/goals-list.tsx b/apps/hash-frontend/src/pages/goals.page/goals-list.tsx
index b502f4b1315..a89def3aa88 100644
--- a/apps/hash-frontend/src/pages/goals.page/goals-list.tsx
+++ b/apps/hash-frontend/src/pages/goals.page/goals-list.tsx
@@ -1,7 +1,7 @@
 import { Box } from "@mui/material";
 import { useMemo } from "react";
 
-import { isGoalFlowDefinitionId } from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
+import { isGoalFlowDefinitionEntityId } from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
 
 import { useAuthenticatedUser } from "../shared/auth-info-context";
 import { useFlowRunsContext } from "../shared/flow-runs-context";
@@ -9,7 +9,6 @@ import { flowRunStatusToStatusText } from "../shared/flow-tables";
 import { GoalListSection } from "./goals-list/goal-list-section";
 
 import type { GoalSummary } from "./goals-list/goal-list-section/goal-row";
-import type { EntityUuid } from "@blockprotocol/type-system";
 
 export const GoalsList = () => {
   const { flowRuns, loading } = useFlowRunsContext();
@@ -26,7 +25,7 @@ export const GoalsList = () => {
     const webByWebId: Record<string, GoalSummary["web"]> = {};
 
     for (const run of flowRuns) {
-      if (!isGoalFlowDefinitionId(run.flowDefinitionId as EntityUuid)) {
+      if (!isGoalFlowDefinitionEntityId(run.flowDefinitionEntityId)) {
         continue;
       }
 
diff --git a/apps/hash-frontend/src/pages/goals/new.page.tsx b/apps/hash-frontend/src/pages/goals/new.page.tsx
index 3f26caf3980..39118041097 100644
--- a/apps/hash-frontend/src/pages/goals/new.page.tsx
+++ b/apps/hash-frontend/src/pages/goals/new.page.tsx
@@ -35,6 +35,7 @@ import { Button } from "../../shared/ui/button";
 import { WorkersHeader } from "../../shared/workers-header";
 import { useAuthenticatedUser } from "../shared/auth-info-context";
 import { EntityTypeSelector } from "../shared/entity-type-selector";
+import { useGenerateHashFlowDefinitionEntityId } from "../shared/use-hash-flows";
 import { WebSelector } from "../shared/web-selector";
 import { defaultBrowserPluginDomains } from "./new.page/default-browser-plugin-domains";
 import { DeliverableSettings } from "./new.page/deliverable-settings";
@@ -189,6 +190,9 @@ const NewGoalPageContent = () => {
   const getOwner = useGetOwnerForEntity();
   const { push } = useRouter();
 
+  const generateHashFlowDefinitionEntityId =
+    useGenerateHashFlowDefinitionEntityId();
+
   const [startFlow, { called }] = useMutation<
     StartFlowMutation,
     StartFlowMutationVariables
@@ -284,7 +288,9 @@ const NewGoalPageContent = () => {
           },
           internetAccess: internetSettings,
         },
-        flowDefinitionId: flowDefinitionIds.goal,
+        flowDefinitionEntityId: generateHashFlowDefinitionEntityId(
+          flowDefinitionIds.goal,
+        ),
         flowInputs,
         webId,
       },
diff --git a/apps/hash-frontend/src/pages/shared/flow-definitions-context-provider.tsx b/apps/hash-frontend/src/pages/shared/flow-definitions-context-provider.tsx
index b5ff0cae3c4..96cb74211c5 100644
--- a/apps/hash-frontend/src/pages/shared/flow-definitions-context-provider.tsx
+++ b/apps/hash-frontend/src/pages/shared/flow-definitions-context-provider.tsx
@@ -4,22 +4,22 @@ import { FlowDefinitionsContext } from "./flow-definitions-context";
 import { useFlowDefinitions } from "./use-flow-definitions";
 
 import type { FlowDefinitionsContextType } from "./flow-definitions-context";
-import type { EntityUuid } from "@blockprotocol/type-system";
+import type { EntityId } from "@blockprotocol/type-system";
 import type { PropsWithChildren } from "react";
 
 export const FlowDefinitionsContextProvider = ({
   children,
-  selectedFlowDefinitionId,
-}: PropsWithChildren<{ selectedFlowDefinitionId: EntityUuid | null }>) => {
+  selectedFlowDefinitionEntityId,
+}: PropsWithChildren<{ selectedFlowDefinitionEntityId: EntityId | null }>) => {
   const { flowDefinitions, loading } = useFlowDefinitions();
 
   const context = useMemo<FlowDefinitionsContextType>(
     () => ({
       flowDefinitions,
       loading,
-      selectedFlowDefinitionId,
+      selectedFlowDefinitionEntityId,
     }),
-    [flowDefinitions, loading, selectedFlowDefinitionId],
+    [flowDefinitions, loading, selectedFlowDefinitionEntityId],
   );
 
   return (
diff --git a/apps/hash-frontend/src/pages/shared/flow-definitions-context.ts b/apps/hash-frontend/src/pages/shared/flow-definitions-context.ts
index a9b9ca439ff..41a29f59243 100644
--- a/apps/hash-frontend/src/pages/shared/flow-definitions-context.ts
+++ b/apps/hash-frontend/src/pages/shared/flow-definitions-context.ts
@@ -1,13 +1,13 @@
 import { createContext, useContext } from "react";
 
-import type { EntityUuid } from "@blockprotocol/type-system";
-import type { FlowDefinitionWithId } from "@local/hash-isomorphic-utils/flows/types";
+import type { LoadedFlowDefinition } from "./use-flow-definitions";
+import type { EntityId } from "@blockprotocol/type-system";
 
 export type FlowDefinitionsContextType = {
   /** The current edition of every flow definition the user can view, from the graph. */
-  flowDefinitions: FlowDefinitionWithId[];
+  flowDefinitions: LoadedFlowDefinition[];
   loading: boolean;
-  selectedFlowDefinitionId: EntityUuid | null;
+  selectedFlowDefinitionEntityId: EntityId | null;
 };
 
 export const FlowDefinitionsContext =
diff --git a/apps/hash-frontend/src/pages/shared/use-flow-definitions.ts b/apps/hash-frontend/src/pages/shared/use-flow-definitions.ts
index 6f1a8aa9ca7..dde3c18ac1d 100644
--- a/apps/hash-frontend/src/pages/shared/use-flow-definitions.ts
+++ b/apps/hash-frontend/src/pages/shared/use-flow-definitions.ts
@@ -2,7 +2,7 @@ import { useQuery } from "@apollo/client";
 import { useMemo } from "react";
 
 import { getRoots } from "@blockprotocol/graph/stdlib";
-import { extractEntityUuidFromEntityId } from "@blockprotocol/type-system";
+import { splitEntityId } from "@blockprotocol/type-system";
 import { deserializeSubgraph } from "@local/hash-graph-sdk/subgraph";
 import { getFlowDefinitionFromEntity } from "@local/hash-isomorphic-utils/flows/mappings";
 import {
@@ -19,15 +19,23 @@ import type {
   QueryEntitySubgraphQueryVariables,
 } from "../../graphql/api-types.gen";
 import type { EntityRootType } from "@blockprotocol/graph";
-import type { EntityUuid, Timestamp } from "@blockprotocol/type-system";
+import type { EntityId, Timestamp } from "@blockprotocol/type-system";
 import type {
   Filter,
   QueryTemporalAxesUnresolved,
 } from "@local/hash-graph-client";
 import type { HashEntity } from "@local/hash-graph-sdk/entity";
-import type { FlowDefinitionWithId } from "@local/hash-isomorphic-utils/flows/types";
+import type { FlowDefinition } from "@local/hash-isomorphic-utils/flows/types";
 import type { FlowDefinition as FlowDefinitionEntity } from "@local/hash-isomorphic-utils/system-types/flowdefinition";
 
+/**
+ * A flow definition loaded from the graph, with the entity id of the `Flow Definition` entity that holds it.
+ */
+export type LoadedFlowDefinition = {
+  flowDefinitionEntityId: EntityId;
+  flowDefinition: FlowDefinition;
+};
+
 const flowDefinitionsQueryVariables = (
   filter: Filter,
   temporalAxes: QueryTemporalAxesUnresolved,
@@ -59,7 +67,7 @@ const flowDefinitionsQueryVariables = (
  */
 const getFlowDefinitionsFromQueryResult = (
   data: QueryEntitySubgraphQuery | undefined,
-): FlowDefinitionWithId[] => {
+): LoadedFlowDefinition[] => {
   if (!data) {
     return [];
   }
@@ -69,19 +77,17 @@ const getFlowDefinitionsFromQueryResult = (
   >(data.queryEntitySubgraph.subgraph);
 
   return getRoots(subgraph).flatMap((entity) => {
-    const flowDefinitionId = extractEntityUuidFromEntityId(
-      entity.metadata.recordId.entityId,
-    );
+    const flowDefinitionEntityId = entity.metadata.recordId.entityId;
 
     try {
       return {
-        flowDefinitionId,
+        flowDefinitionEntityId,
         flowDefinition: getFlowDefinitionFromEntity(entity),
       };
     } catch (error) {
       // eslint-disable-next-line no-console
       console.error(
-        `Flow definition ${flowDefinitionId} is invalid, so isn't shown: ${(error as Error).message}`,
+        `Flow definition ${flowDefinitionEntityId} is invalid, so isn't shown: ${(error as Error).message}`,
       );
       return [];
     }
@@ -92,7 +98,7 @@ const getFlowDefinitionsFromQueryResult = (
  * The current edition of every flow definition the user can view.
  */
 export const useFlowDefinitions = (): {
-  flowDefinitions: FlowDefinitionWithId[];
+  flowDefinitions: LoadedFlowDefinition[];
   loading: boolean;
 } => {
   const { data, loading } = useQuery<
@@ -118,22 +124,31 @@ export const useFlowDefinitions = (): {
  * A flow definition as it was at a moment, e.g. when a run started: the edition the run executed.
  */
 export const useFlowDefinitionAtTime = (params: {
-  flowDefinitionId: EntityUuid | null;
+  flowDefinitionEntityId: EntityId | null;
   timestamp: Timestamp | null;
-}): { flowDefinition: FlowDefinitionWithId | null; loading: boolean } => {
-  const { flowDefinitionId, timestamp } = params;
+}): { flowDefinition: LoadedFlowDefinition | null; loading: boolean } => {
+  const { flowDefinitionEntityId, timestamp } = params;
+
+  const [webId, entityUuid] = flowDefinitionEntityId
+    ? splitEntityId(flowDefinitionEntityId)
+    : [];
 
   const { data, loading } = useQuery<
     QueryEntitySubgraphQuery,
     QueryEntitySubgraphQueryVariables
   >(queryEntitySubgraphQuery, {
     variables: flowDefinitionsQueryVariables(
-      { equal: [{ path: ["uuid"] }, { parameter: flowDefinitionId }] },
+      {
+        all: [
+          { equal: [{ path: ["webId"] }, { parameter: webId }] },
+          { equal: [{ path: ["uuid"] }, { parameter: entityUuid }] },
+        ],
+      },
       timestamp
         ? generateTimeInstantTemporalAxes(timestamp)
         : currentTimeInstantTemporalAxes,
     ),
-    skip: !flowDefinitionId || !timestamp,
+    skip: !flowDefinitionEntityId || !timestamp,
     fetchPolicy: "cache-first",
   });
 
diff --git a/apps/hash-frontend/src/pages/shared/use-hash-flows.ts b/apps/hash-frontend/src/pages/shared/use-hash-flows.ts
new file mode 100644
index 00000000000..dd9a33e2e35
--- /dev/null
+++ b/apps/hash-frontend/src/pages/shared/use-hash-flows.ts
@@ -0,0 +1,30 @@
+import { useCallback } from "react";
+
+import { extractWebIdFromEntityId } from "@blockprotocol/type-system";
+import { generateHashFlowDefinitionEntityId } from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
+
+import { useHashInstance } from "../../components/hooks/use-hash-instance";
+
+import type { EntityId, EntityUuid } from "@blockprotocol/type-system";
+
+/**
+ * Generates the entity id of one of the flows defined in code, from its id in `flowDefinitionIds`, to start a run of
+ * it. They're in the web the `HASH Instance` entity is in.
+ */
+export const useGenerateHashFlowDefinitionEntityId = () => {
+  const { hashInstance } = useHashInstance();
+
+  return useCallback(
+    (flowDefinitionId: EntityUuid): EntityId => {
+      if (!hashInstance) {
+        throw new Error("The HASH instance hasn't loaded");
+      }
+
+      return generateHashFlowDefinitionEntityId(
+        extractWebIdFromEntityId(hashInstance.metadata.recordId.entityId),
+        flowDefinitionId,
+      );
+    },
+    [hashInstance],
+  );
+};
diff --git a/apps/hash-frontend/src/pages/workers.page.tsx b/apps/hash-frontend/src/pages/workers.page.tsx
index 1a605ab189a..5df405f5837 100644
--- a/apps/hash-frontend/src/pages/workers.page.tsx
+++ b/apps/hash-frontend/src/pages/workers.page.tsx
@@ -20,7 +20,7 @@ const WorkersPageContent = () => {
     query: { [workerFlowFilterParam]: definitionFilterQueryParam },
   } = useRouter();
 
-  const flowDefinitionIdFilter = useMemo(() => {
+  const flowDefinitionEntityIdFilter = useMemo(() => {
     if (!definitionFilterQueryParam) {
       return undefined;
     }
@@ -48,7 +48,9 @@ const WorkersPageContent = () => {
             <Typography variant="h5" sx={{ mb: 2, fontWeight: 600 }}>
               Flow Runs
             </Typography>
-            <FlowRunTable flowDefinitionIdFilter={flowDefinitionIdFilter} />
+            <FlowRunTable
+              flowDefinitionEntityIdFilter={flowDefinitionEntityIdFilter}
+            />
           </Box>
 
           <Box>
diff --git a/apps/hash-frontend/src/pages/workers.page/flow-run-table.tsx b/apps/hash-frontend/src/pages/workers.page/flow-run-table.tsx
index 189fadac2fc..fa3b7092ee6 100644
--- a/apps/hash-frontend/src/pages/workers.page/flow-run-table.tsx
+++ b/apps/hash-frontend/src/pages/workers.page/flow-run-table.tsx
@@ -14,7 +14,7 @@ import {
   InfinityLightIcon,
   Skeleton,
 } from "@hashintel/design-system";
-import { isGoalFlowDefinitionId } from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
+import { isGoalFlowDefinitionEntityId } from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
 import { generateWorkerRunPath } from "@local/hash-isomorphic-utils/flows/frontend-paths";
 
 import { Link } from "../../shared/ui/link";
@@ -271,10 +271,12 @@ const LoadingComponent = ({ columnCount }: { columnCount: number }) => (
 );
 
 type FlowRunTableProps = {
-  flowDefinitionIdFilter?: string[];
+  flowDefinitionEntityIdFilter?: string[];
 };
 
-export const FlowRunTable = ({ flowDefinitionIdFilter }: FlowRunTableProps) => {
+export const FlowRunTable = ({
+  flowDefinitionEntityIdFilter,
+}: FlowRunTableProps) => {
   const [sort, setSort] = useState<VirtualizedTableSort<FieldId>>({
     fieldId: "closedAt",
     direction: "desc",
@@ -291,13 +293,16 @@ export const FlowRunTable = ({ flowDefinitionIdFilter }: FlowRunTableProps) => {
   const { authenticatedUser } = useAuthenticatedUser();
 
   const filteredFlowRuns = useMemo(() => {
-    if (!flowDefinitionIdFilter || flowDefinitionIdFilter.length === 0) {
+    if (
+      !flowDefinitionEntityIdFilter ||
+      flowDefinitionEntityIdFilter.length === 0
+    ) {
       return unfilteredFlowRuns;
     }
     return unfilteredFlowRuns.filter((run) =>
-      flowDefinitionIdFilter.includes(run.flowDefinitionId),
+      flowDefinitionEntityIdFilter.includes(run.flowDefinitionEntityId),
     );
-  }, [unfilteredFlowRuns, flowDefinitionIdFilter]);
+  }, [unfilteredFlowRuns, flowDefinitionEntityIdFilter]);
 
   const { isUsageAvailable: usageAvailable, usageByFlowRun } = useFlowRunsUsage(
     {
@@ -310,8 +315,8 @@ export const FlowRunTable = ({ flowDefinitionIdFilter }: FlowRunTableProps) => {
 
     const rowData: VirtualizedTableRow<WorkerSummary>[] = filteredFlowRuns.map(
       (flowRun) => {
-        const type = isGoalFlowDefinitionId(
-          flowRun.flowDefinitionId as EntityUuid,
+        const type = isGoalFlowDefinitionEntityId(
+          flowRun.flowDefinitionEntityId,
         )
           ? "goal"
           : "flow";
@@ -417,10 +422,10 @@ export const FlowRunTable = ({ flowDefinitionIdFilter }: FlowRunTableProps) => {
     () => (
       <EmptyComponent
         columnCount={columns.length}
-        filtered={!!flowDefinitionIdFilter?.length}
+        filtered={!!flowDefinitionEntityIdFilter?.length}
       />
     ),
-    [columns, flowDefinitionIdFilter],
+    [columns, flowDefinitionEntityIdFilter],
   );
 
   const LoadingPlaceholder = useCallback(
diff --git a/apps/plugin-browser/src/graphql/queries/flow.queries.ts b/apps/plugin-browser/src/graphql/queries/flow.queries.ts
index 24de8766b42..9ffe25a70df 100644
--- a/apps/plugin-browser/src/graphql/queries/flow.queries.ts
+++ b/apps/plugin-browser/src/graphql/queries/flow.queries.ts
@@ -4,7 +4,7 @@ export const getMinimalFlowRunsQuery = /* GraphQL */ `
       totalCount
       flowRuns {
         name
-        flowDefinitionId
+        flowDefinitionEntityId
         flowRunEntityId
         webId
         status
diff --git a/apps/plugin-browser/src/graphql/queries/user.queries.ts b/apps/plugin-browser/src/graphql/queries/user.queries.ts
index 3765a2c6da0..1e4d3b7b370 100644
--- a/apps/plugin-browser/src/graphql/queries/user.queries.ts
+++ b/apps/plugin-browser/src/graphql/queries/user.queries.ts
@@ -9,6 +9,9 @@ export const meQuery = /* GraphQL */ `
         ...SubgraphFields
       }
     }
+    hashInstanceSettings {
+      entity
+    }
   }
   ${print(subgraphFieldsFragment)}
 `;
diff --git a/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/automatically-triggered.tsx b/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/automatically-triggered.tsx
index 4ee5b937b23..bfc6614de6c 100644
--- a/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/automatically-triggered.tsx
+++ b/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/automatically-triggered.tsx
@@ -1,7 +1,10 @@
 import { TableCell, TableRow } from "@mui/material";
 import { useMemo } from "react";
 
-import { flowDefinitionIds } from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
+import {
+  flowDefinitionIds,
+  isHashFlowDefinitionEntityId,
+} from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
 
 import { EventTable } from "./shared/event-table";
 import { HistoryRow } from "./shared/history-row";
@@ -18,9 +21,10 @@ export const AutomaticallyTriggered = ({
     () =>
       unfilteredFlowRuns.filter(
         (flow) =>
-          flow.flowDefinitionId ===
-            flowDefinitionIds.automaticBrowserInference ||
-          flow.requestedPageUrl,
+          isHashFlowDefinitionEntityId(
+            flow.flowDefinitionEntityId,
+            flowDefinitionIds.automaticBrowserInference,
+          ) || flow.requestedPageUrl,
       ),
     [unfilteredFlowRuns],
   );
diff --git a/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/manually-triggered.tsx b/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/manually-triggered.tsx
index 386212e2462..9b516e8469e 100644
--- a/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/manually-triggered.tsx
+++ b/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/manually-triggered.tsx
@@ -1,7 +1,10 @@
 import { TableCell, TableRow } from "@mui/material";
 import { useMemo } from "react";
 
-import { flowDefinitionIds } from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
+import {
+  flowDefinitionIds,
+  isHashFlowDefinitionEntityId,
+} from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
 
 import { EventTable } from "./shared/event-table";
 import { HistoryRow } from "./shared/history-row";
@@ -16,9 +19,11 @@ export const ManuallyTriggered = ({
 }) => {
   const manuallyTriggeredFlows = useMemo(
     () =>
-      unfilteredFlowRuns.filter(
-        (flow) =>
-          flow.flowDefinitionId === flowDefinitionIds.manualBrowserInference,
+      unfilteredFlowRuns.filter((flow) =>
+        isHashFlowDefinitionEntityId(
+          flow.flowDefinitionEntityId,
+          flowDefinitionIds.manualBrowserInference,
+        ),
       ),
     [unfilteredFlowRuns],
   );
diff --git a/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/shared/table-label.tsx b/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/shared/table-label.tsx
index 32e93187322..5d30c19fdab 100644
--- a/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/shared/table-label.tsx
+++ b/apps/plugin-browser/src/pages/popup/popup-contents/action-center/history/shared/table-label.tsx
@@ -1,10 +1,21 @@
 import { Link, Stack, Typography } from "@mui/material";
 
 import { ArrowUpRightRegularIcon } from "@hashintel/design-system";
-import { flowDefinitionIds } from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
+import {
+  flowDefinitionIds,
+  generateHashFlowDefinitionEntityId,
+} from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
 import { generatedFilteredWorkersPath } from "@local/hash-isomorphic-utils/flows/frontend-paths";
 
+import { useUserContext } from "../../../shared/user-context";
+
 export const TableLabel = ({ type }: { type: "manual" | "automatic" }) => {
+  const { user } = useUserContext();
+
+  if (!user) {
+    return null;
+  }
+
   return (
     <Stack direction="row" justifyContent="space-between" mb={0.75}>
       <Typography variant="smallCaps" sx={{ fontSize: 12 }}>
@@ -12,10 +23,14 @@ export const TableLabel = ({ type }: { type: "manual" | "automatic" }) => {
       </Typography>
       <Link
         href={`${FRONTEND_ORIGIN}${generatedFilteredWorkersPath({
-          flowDefinitionIds:
-            type === "manual"
-              ? [flowDefinitionIds.manualBrowserInference]
-              : [flowDefinitionIds.automaticBrowserInference],
+          flowDefinitionEntityIds: [
+            generateHashFlowDefinitionEntityId(
+              user.hashWebId,
+              type === "manual"
+                ? flowDefinitionIds.manualBrowserInference
+                : flowDefinitionIds.automaticBrowserInference,
+            ),
+          ],
         })}`}
         sx={{
           alignItems: "center",
diff --git a/apps/plugin-browser/src/pages/popup/popup-contents/action-center/shared/use-flow-runs.ts b/apps/plugin-browser/src/pages/popup/popup-contents/action-center/shared/use-flow-runs.ts
index 1c324f86404..28e3ad8f69d 100644
--- a/apps/plugin-browser/src/pages/popup/popup-contents/action-center/shared/use-flow-runs.ts
+++ b/apps/plugin-browser/src/pages/popup/popup-contents/action-center/shared/use-flow-runs.ts
@@ -1,7 +1,10 @@
 import { useEffect, useMemo, useState } from "react";
 
 import { extractWebIdFromEntityId } from "@blockprotocol/type-system";
-import { flowDefinitionIds } from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
+import {
+  flowDefinitionIds,
+  isHashFlowDefinitionEntityId,
+} from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
 
 import { getMinimalFlowRunsQuery } from "../../../../../graphql/queries/flow.queries";
 import { queryGraphQlApi } from "../../../../../shared/query-graphql-api";
@@ -89,10 +92,14 @@ const getFlowRuns = async ({
 
       for (const flowRun of unfilteredFlowRuns) {
         if (
-          flowRun.flowDefinitionId ===
-            flowDefinitionIds.manualBrowserInference ||
-          flowRun.flowDefinitionId ===
-            flowDefinitionIds.automaticBrowserInference
+          isHashFlowDefinitionEntityId(
+            flowRun.flowDefinitionEntityId,
+            flowDefinitionIds.manualBrowserInference,
+          ) ||
+          isHashFlowDefinitionEntityId(
+            flowRun.flowDefinitionEntityId,
+            flowDefinitionIds.automaticBrowserInference,
+          )
         ) {
           flowRunsOfInterest.push(mapFlowRunToMinimalFlowRun(flowRun));
         }
diff --git a/apps/plugin-browser/src/scripts/background/infer-entities.ts b/apps/plugin-browser/src/scripts/background/infer-entities.ts
index 32eb36515b3..1982238f2e5 100644
--- a/apps/plugin-browser/src/scripts/background/infer-entities.ts
+++ b/apps/plugin-browser/src/scripts/background/infer-entities.ts
@@ -2,7 +2,10 @@ import { v4 as uuid } from "uuid";
 import browser from "webextension-polyfill";
 
 import { entityIdFromComponents } from "@blockprotocol/type-system";
-import { flowDefinitionIds } from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
+import {
+  flowDefinitionIds,
+  generateHashFlowDefinitionEntityId,
+} from "@local/hash-isomorphic-utils/flows/flow-definition-ids";
 import { sleep } from "@local/hash-isomorphic-utils/sleep";
 
 import { FlowRunStatus } from "../../graphql/api-types.gen";
@@ -368,10 +371,12 @@ export const inferEntities = async (
 
   await sendInferEntitiesMessage(inferenceArgs);
 
-  const flowDefinitionId =
+  const flowDefinitionEntityId = generateHashFlowDefinitionEntityId(
+    user.hashWebId,
     trigger === "automatic"
       ? flowDefinitionIds.automaticBrowserInference
-      : flowDefinitionIds.manualBrowserInference;
+      : flowDefinitionIds.manualBrowserInference,
+  );
 
   /**
    * Optimistically add the run to local storage so that it appears in the history tab immediately.
@@ -380,7 +385,7 @@ export const inferEntities = async (
   await setLocalPendingRuns((existingValue) => [
     ...(existingValue ?? []),
     {
-      flowDefinitionId,
+      flowDefinitionEntityId,
       flowRunEntityId: entityIdFromComponents(webId, requestUuid),
       closedAt: null,
       executedAt: new Date().toISOString(),
diff --git a/apps/plugin-browser/src/shared/get-user.ts b/apps/plugin-browser/src/shared/get-user.ts
index 77ee9d13a67..470719f8ac8 100644
--- a/apps/plugin-browser/src/shared/get-user.ts
+++ b/apps/plugin-browser/src/shared/get-user.ts
@@ -4,6 +4,7 @@ import {
   intervalForTimestamp,
 } from "@blockprotocol/graph/stdlib";
 import { currentTimestamp } from "@blockprotocol/type-system";
+import { HashEntity } from "@local/hash-graph-sdk/entity";
 import { mapGqlSubgraphFieldsFragmentToSubgraph } from "@local/hash-isomorphic-utils/graph-queries";
 import {
   systemEntityTypes,
@@ -21,7 +22,6 @@ import type { MeQuery, MeQueryVariables } from "../graphql/api-types.gen";
 import type { LocalStorage } from "./storage";
 import type { EntityRootType, Subgraph } from "@blockprotocol/graph";
 import type { Entity, EntityId, WebId } from "@blockprotocol/type-system";
-import type { HashEntity } from "@local/hash-graph-sdk/entity";
 import type { FeatureFlag } from "@local/hash-isomorphic-utils/feature-flags";
 import type { ImageFile } from "@local/hash-isomorphic-utils/system-types/imagefile";
 import type {
@@ -69,6 +69,16 @@ export const getUser = (): Promise<LocalStorage["user"] | null> => {
 
       const user = getRoots(subgraph)[0]!;
 
+      const hashInstanceEntity = data.hashInstanceSettings?.entity;
+
+      if (!hashInstanceEntity) {
+        throw new Error("The API returned no HASH instance settings");
+      }
+
+      const hashWebId = getWebIdFromEntityId(
+        new HashEntity(hashInstanceEntity).metadata.recordId.entityId,
+      );
+
       const simpleProperties = simplifyProperties(
         user.properties as UserProperties,
       );
@@ -305,6 +315,7 @@ export const getUser = (): Promise<LocalStorage["user"] | null> => {
         enabledFeatureFlags,
         settingsEntityId,
         webWebId: getWebIdFromEntityId(user.metadata.recordId.entityId),
+        hashWebId,
       } as LocalStorage["user"];
     })
     .catch((error) => {
diff --git a/apps/plugin-browser/src/shared/storage.ts b/apps/plugin-browser/src/shared/storage.ts
index 2eb15629ffd..5e9c3e4775a 100644
--- a/apps/plugin-browser/src/shared/storage.ts
+++ b/apps/plugin-browser/src/shared/storage.ts
@@ -57,6 +57,8 @@ type UserAndLinkedData = SimplifiedUser & {
   })[];
   settingsEntityId: EntityId;
   webWebId: WebId;
+  /** The web HASH's own flow definitions are in: the web the `HASH Instance` entity is in. */
+  hashWebId: WebId;
 };
 
 const persistedUserSettingKeys = [
@@ -92,7 +94,7 @@ export type ExternalInputRequestById = {
 
 export type MinimalFlowRun = Pick<
   FlowRun,
-  | "flowDefinitionId"
+  | "flowDefinitionEntityId"
   | "flowRunEntityId"
   | "webId"
   | "closedAt"
diff --git a/libs/@local/hash-backend-utils/src/flows.ts b/libs/@local/hash-backend-utils/src/flows.ts
index 8aa287687cc..94e5d2919ba 100644
--- a/libs/@local/hash-backend-utils/src/flows.ts
+++ b/libs/@local/hash-backend-utils/src/flows.ts
@@ -1,4 +1,7 @@
-import { extractWebIdFromEntityId } from "@blockprotocol/type-system";
+import {
+  extractEntityUuidFromEntityId,
+  extractWebIdFromEntityId,
+} from "@blockprotocol/type-system";
 import { typedKeys } from "@local/advanced-types/typed-entries";
 import { queryEntities, summarizeEntities } from "@local/hash-graph-sdk/entity";
 import { flowRunsQueryMaxLimit } from "@local/hash-isomorphic-utils/flows/types";
@@ -99,17 +102,17 @@ export async function getFlowRunById({
     })
   ).get(flowRunEntityId);
 
-  if (!links?.flowDefinitionId) {
+  if (!links?.flowDefinitionEntityId) {
     /* A run from before flow runs linked to their definition: it can't be shown. */
     return null;
   }
 
-  const flowDefinitionId = links.flowDefinitionId;
+  const flowDefinitionEntityId = links.flowDefinitionEntityId;
   const flowScheduleId = links.flowTriggerId ?? undefined;
 
   if (includeDetails) {
     return getFlowRunFromTemporalWorkflowId({
-      flowDefinitionId,
+      flowDefinitionEntityId,
       flowRunEntityId,
       flowScheduleId,
       name,
@@ -120,7 +123,7 @@ export async function getFlowRunById({
     });
   } else {
     return getSparseFlowRunFromTemporalWorkflowId({
-      flowDefinitionId,
+      flowDefinitionEntityId,
       flowRunEntityId,
       flowScheduleId,
       name,
@@ -141,7 +144,7 @@ const convertScreamingSnakeToPascalCase = (str: string) =>
 
 type GetFlowRunsFilters = {
   executionStatus?: FlowRunStatus | null;
-  flowDefinitionIds?: string[] | null;
+  flowDefinitionEntityIds?: EntityId[] | null;
   cursor?: string | null;
   limit?: number | null;
 };
@@ -156,7 +159,7 @@ type GetFlowRunsFnArgs<IncludeDetails extends boolean> = {
 };
 
 type MinimalFlowMetadata = {
-  flowDefinitionId: EntityUuid;
+  flowDefinitionEntityId: EntityId;
   flowRunEntityId: EntityId;
   flowScheduleId?: EntityUuid;
   name: string;
@@ -211,19 +214,25 @@ export async function getFlowRuns({
           },
         ],
       },
-      ...(filters.flowDefinitionIds
+      ...(filters.flowDefinitionEntityIds
         ? [
             {
               /**
-               * A run `Uses` the flow definition it runs. Flow definition ids are the uuids of their entities, and
-               * no other entity a run links to shares one.
+               * A run `Uses` the flow definition it runs. Matched by the definition's uuid here, and by its full
+               * entity id when the run's links are read below.
                */
-              any: filters.flowDefinitionIds.map((flowDefinitionId) => ({
-                equal: [
-                  { path: ["outgoingLinks", "rightEntity", "uuid"] },
-                  { parameter: flowDefinitionId },
-                ],
-              })),
+              any: filters.flowDefinitionEntityIds.map(
+                (flowDefinitionEntityId) => ({
+                  equal: [
+                    { path: ["outgoingLinks", "rightEntity", "uuid"] },
+                    {
+                      parameter: extractEntityUuidFromEntityId(
+                        flowDefinitionEntityId,
+                      ),
+                    },
+                  ],
+                }),
+              ),
             },
           ]
         : []),
@@ -278,7 +287,7 @@ export async function getFlowRuns({
 
     const links = linksByFlowRunEntityId.get(flowRunEntityId);
 
-    if (!links?.flowDefinitionId) {
+    if (!links?.flowDefinitionEntityId) {
       /* A run from before flow runs linked to their definition: it can't be shown. */
       continue;
     }
@@ -288,8 +297,8 @@ export async function getFlowRuns({
      * one of the requested definitions. A page can then hold fewer runs than its limit.
      */
     if (
-      filters.flowDefinitionIds &&
-      !filters.flowDefinitionIds.includes(links.flowDefinitionId)
+      filters.flowDefinitionEntityIds &&
+      !filters.flowDefinitionEntityIds.includes(links.flowDefinitionEntityId)
     ) {
       continue;
     }
@@ -303,7 +312,7 @@ export async function getFlowRuns({
       entity.properties["https://hash.ai/@h/types/property-type/workflow-id/"];
 
     temporalWorkflowIdToFlowDetails[temporalWorkflowId] = {
-      flowDefinitionId: links.flowDefinitionId,
+      flowDefinitionEntityId: links.flowDefinitionEntityId,
       flowRunEntityId,
       flowScheduleId: links.flowTriggerId ?? undefined,
       name,
@@ -374,7 +383,7 @@ export async function getFlowRuns({
       const flowDetails = temporalWorkflowIdToFlowDetails[temporalWorkflowId]!;
 
       const runInfo = await getFlowRunFromTemporalWorkflowId({
-        flowDefinitionId: flowDetails.flowDefinitionId,
+        flowDefinitionEntityId: flowDetails.flowDefinitionEntityId,
         flowRunEntityId: flowDetails.flowRunEntityId,
         flowScheduleId: flowDetails.flowScheduleId,
         name: flowDetails.name,
@@ -394,7 +403,7 @@ export async function getFlowRuns({
       const flowDetails = temporalWorkflowIdToFlowDetails[temporalWorkflowId]!;
 
       const runInfo = await getSparseFlowRunFromTemporalWorkflowId({
-        flowDefinitionId: flowDetails.flowDefinitionId,
+        flowDefinitionEntityId: flowDetails.flowDefinitionEntityId,
         flowRunEntityId: flowDetails.flowRunEntityId,
         flowScheduleId: flowDetails.flowScheduleId,
         name: flowDetails.name,
diff --git a/libs/@local/hash-backend-utils/src/flows/get-flow-run-details.ts b/libs/@local/hash-backend-utils/src/flows/get-flow-run-details.ts
index 5dfb0c70be1..fc67ed2ca7d 100644
--- a/libs/@local/hash-backend-utils/src/flows/get-flow-run-details.ts
+++ b/libs/@local/hash-backend-utils/src/flows/get-flow-run-details.ts
@@ -746,7 +746,7 @@ const getFlowRunDetailedFields = async ({
 };
 
 export const getSparseFlowRunFromTemporalWorkflowId = async ({
-  flowDefinitionId,
+  flowDefinitionEntityId,
   flowRunEntityId,
   flowScheduleId,
   name,
@@ -755,7 +755,7 @@ export const getSparseFlowRunFromTemporalWorkflowId = async ({
   webId,
 }: {
   /** The flow definition the run `Uses`, from its link */
-  flowDefinitionId: EntityUuid;
+  flowDefinitionEntityId: EntityId;
   /** The entity id of the flow run */
   flowRunEntityId: EntityId;
   /** The schedule the run was `Triggered By`, if any, from its link */
@@ -773,7 +773,7 @@ export const getSparseFlowRunFromTemporalWorkflowId = async ({
 
   return {
     name,
-    flowDefinitionId,
+    flowDefinitionEntityId,
     flowRunEntityId,
     flowScheduleId,
     status: status.name as FlowRunStatus,
@@ -786,7 +786,7 @@ export const getSparseFlowRunFromTemporalWorkflowId = async ({
 
 export const getFlowRunFromTemporalWorkflowId = async (args: {
   /** The flow definition the run `Uses`, from its link */
-  flowDefinitionId: EntityUuid;
+  flowDefinitionEntityId: EntityId;
   /** The entity id of the flow run */
   flowRunEntityId: EntityId;
   /** The schedule the run was `Triggered By`, if any, from its link */
diff --git a/libs/@local/hash-backend-utils/src/flows/process-flow-workflow.ts b/libs/@local/hash-backend-utils/src/flows/process-flow-workflow.ts
index 727211411d6..bec4b5957a4 100644
--- a/libs/@local/hash-backend-utils/src/flows/process-flow-workflow.ts
+++ b/libs/@local/hash-backend-utils/src/flows/process-flow-workflow.ts
@@ -41,7 +41,7 @@ import type {
   CreateFlowActivities,
   ProxyFlowActivity,
 } from "./action-types.js";
-import type { EntityUuid, Timestamp } from "@blockprotocol/type-system";
+import type { EntityId, Timestamp } from "@blockprotocol/type-system";
 import type { FlowActionStepOutput } from "@local/hash-isomorphic-utils/flows/action-definitions";
 import type {
   BaseRunFlowWorkflowParams,
@@ -302,7 +302,7 @@ const processFlow = async <
   params: BaseRunFlowWorkflowParams & {
     generateFlowRunName?: (params: {
       flowDefinition: FlowDefinition;
-      flowDefinitionId: EntityUuid;
+      flowDefinitionEntityId: EntityId;
       flowInputs: FlowInputValues;
     }) => Promise<string>;
     proxyFlowActivity: ProxyFlowActivity<
@@ -312,7 +312,7 @@ const processFlow = async <
   },
 ): Promise<RunFlowWorkflowResponse> => {
   const {
-    flowDefinitionId,
+    flowDefinitionEntityId,
     flowRunEntityUuid,
     flowRunName,
     flowInputs,
@@ -329,7 +329,7 @@ const processFlow = async <
    */
   const flowDefinitionResult = await getFlowDefinitionActivity({
     atTime: workflowInfo().startTime.toISOString() as Timestamp,
-    flowDefinitionId,
+    flowDefinitionEntityId,
     userAuthentication,
   });
 
@@ -400,7 +400,7 @@ const processFlow = async <
 
   const flow = initializeFlow({
     flowDefinition,
-    flowDefinitionId,
+    flowDefinitionEntityId,
     flowInputs,
     temporalWorkflowId: workflowId,
     /**
@@ -423,7 +423,7 @@ const processFlow = async <
   if (generateFlowRunName) {
     const generatedName = await generateFlowRunName({
       flowDefinition,
-      flowDefinitionId,
+      flowDefinitionEntityId,
       flowInputs,
     });
     flow.name = generatedName;
diff --git a/libs/@local/hash-backend-utils/src/flows/process-flow-workflow/common-activities/get-flow-definition-activity.ts b/libs/@local/hash-backend-utils/src/flows/process-flow-workflow/common-activities/get-flow-definition-activity.ts
index 613110b82ed..386be99060c 100644
--- a/libs/@local/hash-backend-utils/src/flows/process-flow-workflow/common-activities/get-flow-definition-activity.ts
+++ b/libs/@local/hash-backend-utils/src/flows/process-flow-workflow/common-activities/get-flow-definition-activity.ts
@@ -5,7 +5,6 @@ import { getFlowDefinitionEntityById } from "../../shared/get-flow-definition-en
 import type {
   ActorEntityUuid,
   EntityId,
-  EntityUuid,
   Timestamp,
 } from "@blockprotocol/type-system";
 import type { GraphApi } from "@local/hash-graph-client";
@@ -14,7 +13,7 @@ import type { FlowDefinition } from "@local/hash-isomorphic-utils/flows/types";
 export type GetFlowDefinitionActivityParams = {
   /** When the run started: it executes the edition of the definition current then. */
   atTime: Timestamp;
-  flowDefinitionId: EntityUuid;
+  flowDefinitionEntityId: EntityId;
   userAuthentication: { actorId: ActorEntityUuid };
 };
 
@@ -32,12 +31,12 @@ export const getFlowDefinitionActivity = async (
     }
   | { status: "not-found" | "invalid"; errorMessage: string }
 > => {
-  const { atTime, flowDefinitionId, graphApiClient, userAuthentication } =
+  const { atTime, flowDefinitionEntityId, graphApiClient, userAuthentication } =
     params;
 
   const entity = await getFlowDefinitionEntityById({
     atTime,
-    flowDefinitionId,
+    flowDefinitionEntityId,
     graphApiClient,
     userAuthentication,
   });
@@ -45,7 +44,7 @@ export const getFlowDefinitionActivity = async (
   if (!entity) {
     return {
       status: "not-found",
-      errorMessage: `No Flow Definition entity with uuid ${flowDefinitionId} exists, or the user can't view it`,
+      errorMessage: `No Flow Definition entity ${flowDefinitionEntityId} exists, or the user can't view it`,
     };
   }
 
diff --git a/libs/@local/hash-backend-utils/src/flows/process-flow-workflow/initialize-flow.ts b/libs/@local/hash-backend-utils/src/flows/process-flow-workflow/initialize-flow.ts
index 614ab8acb68..578254ed96a 100644
--- a/libs/@local/hash-backend-utils/src/flows/process-flow-workflow/initialize-flow.ts
+++ b/libs/@local/hash-backend-utils/src/flows/process-flow-workflow/initialize-flow.ts
@@ -2,7 +2,7 @@ import { actionDefinitions } from "@local/hash-isomorphic-utils/flows/action-def
 
 import { getAllStepsInFlow } from "./get-all-steps-in-flow.js";
 
-import type { EntityUuid } from "@blockprotocol/type-system";
+import type { EntityId } from "@blockprotocol/type-system";
 import type {
   ActionStep,
   ActionStepDefinition,
@@ -167,14 +167,14 @@ export const initializeForEachStep = (params: {
 
 export const initializeFlow = (params: {
   flowDefinition: FlowDefinition;
-  flowDefinitionId: EntityUuid;
+  flowDefinitionEntityId: EntityId;
   flowInputs: FlowInputValues;
   name: string;
   temporalWorkflowId: string;
 }): LocalFlowRun => {
   const {
     flowDefinition,
-    flowDefinitionId,
+    flowDefinitionEntityId,
     flowInputs,
     name,
     temporalWorkflowId,
@@ -184,7 +184,7 @@ export const initializeFlow = (params: {
     name,
     temporalWorkflowId,
     flowInputs,
-    flowDefinitionId,
+    flowDefinitionEntityId,
     steps: flowDefinition.steps.map<FlowStep>((stepDefinition) =>
       stepDefinition.kind === "action"
         ? initializeActionStep({ flowInputs, stepDefinition })
diff --git a/libs/@local/hash-backend-utils/src/flows/shared/get-flow-definition-entity-by-id.ts b/libs/@local/hash-backend-utils/src/flows/shared/get-flow-definition-entity-by-id.ts
index c988061c631..29b7d5d0d05 100644
--- a/libs/@local/hash-backend-utils/src/flows/shared/get-flow-definition-entity-by-id.ts
+++ b/libs/@local/hash-backend-utils/src/flows/shared/get-flow-definition-entity-by-id.ts
@@ -1,3 +1,4 @@
+import { splitEntityId } from "@blockprotocol/type-system";
 import { type HashEntity, queryEntities } from "@local/hash-graph-sdk/entity";
 import {
   currentTimeInstantTemporalAxes,
@@ -7,25 +8,27 @@ import { systemEntityTypes } from "@local/hash-isomorphic-utils/ontology-type-id
 
 import type {
   ActorEntityUuid,
-  EntityUuid,
+  EntityId,
   Timestamp,
 } from "@blockprotocol/type-system";
 import type { GraphApi } from "@local/hash-graph-client";
 import type { FlowDefinition as FlowDefinitionEntity } from "@local/hash-isomorphic-utils/system-types/flowdefinition";
 
 /**
- * The `Flow Definition` entity of a flow definition, whose uuid is the flow definition's id: e.g. for a run or
- * trigger to link to. Its edition current at `atTime`, if given, and otherwise its current edition.
+ * A `Flow Definition` entity, if the user can view it: e.g. for a run or trigger to link to. Its edition current at
+ * `atTime`, if given, and otherwise its current edition.
  */
 export const getFlowDefinitionEntityById = async (params: {
   atTime?: Timestamp;
-  flowDefinitionId: EntityUuid;
+  flowDefinitionEntityId: EntityId;
   graphApiClient: GraphApi;
   userAuthentication: { actorId: ActorEntityUuid };
 }): Promise<HashEntity<FlowDefinitionEntity> | null> => {
-  const { atTime, flowDefinitionId, graphApiClient, userAuthentication } =
+  const { atTime, flowDefinitionEntityId, graphApiClient, userAuthentication } =
     params;
 
+  const [webId, entityUuid] = splitEntityId(flowDefinitionEntityId);
+
   const {
     entities: [flowDefinitionEntity],
   } = await queryEntities<FlowDefinitionEntity>(
@@ -34,7 +37,8 @@ export const getFlowDefinitionEntityById = async (params: {
     {
       filter: {
         all: [
-          { equal: [{ path: ["uuid"] }, { parameter: flowDefinitionId }] },
+          { equal: [{ path: ["webId"] }, { parameter: webId }] },
+          { equal: [{ path: ["uuid"] }, { parameter: entityUuid }] },
           {
             equal: [
               { path: ["type", "baseUrl"] },
diff --git a/libs/@local/hash-backend-utils/src/flows/shared/get-flow-run-links.ts b/libs/@local/hash-backend-utils/src/flows/shared/get-flow-run-links.ts
index efce2dd8980..bb4e837e3eb 100644
--- a/libs/@local/hash-backend-utils/src/flows/shared/get-flow-run-links.ts
+++ b/libs/@local/hash-backend-utils/src/flows/shared/get-flow-run-links.ts
@@ -16,7 +16,7 @@ import type { GraphApi } from "@local/hash-graph-client";
  * was `Triggered By`, if any.
  */
 export type FlowRunLinks = {
-  flowDefinitionId: EntityUuid | null;
+  flowDefinitionEntityId: EntityId | null;
   flowTriggerId: EntityUuid | null;
 };
 
@@ -36,7 +36,7 @@ export const getFlowRunLinks = async (params: {
   const linksByFlowRunEntityId = new Map<EntityId, FlowRunLinks>(
     flowRunEntityIds.map((flowRunEntityId) => [
       flowRunEntityId,
-      { flowDefinitionId: null, flowTriggerId: null },
+      { flowDefinitionEntityId: null, flowTriggerId: null },
     ]),
   );
 
@@ -91,36 +91,44 @@ export const getFlowRunLinks = async (params: {
       continue;
     }
 
-    const rightEntityUuid = extractEntityUuidFromEntityId(
-      linkData.rightEntityId,
-    );
-
     const isOfLinkType = (linkEntityTypeBaseUrl: string) =>
       linkEntity.metadata.entityTypeIds.some((entityTypeId) =>
         entityTypeId.startsWith(linkEntityTypeBaseUrl),
       );
 
-    const field = isOfLinkType(systemLinkEntityTypes.uses.linkEntityTypeBaseUrl)
-      ? "flowDefinitionId"
+    const link = isOfLinkType(systemLinkEntityTypes.uses.linkEntityTypeBaseUrl)
+      ? {
+          field: "flowDefinitionEntityId" as const,
+          linkName: "Uses",
+          target: linkData.rightEntityId,
+        }
       : isOfLinkType(systemLinkEntityTypes.triggeredBy.linkEntityTypeBaseUrl)
-        ? "flowTriggerId"
+        ? {
+            field: "flowTriggerId" as const,
+            linkName: "Triggered By",
+            target: extractEntityUuidFromEntityId(linkData.rightEntityId),
+          }
         : null;
 
-    if (!field) {
+    if (!link) {
       continue;
     }
 
     /* A run is created with one link of each kind, so another can only have been added since. The last one read wins. */
-    const existingEntityUuid = links[field];
+    const existingTarget = links[link.field];
 
-    if (existingEntityUuid && existingEntityUuid !== rightEntityUuid) {
+    if (existingTarget && existingTarget !== link.target) {
       // eslint-disable-next-line no-console
       console.warn(
-        `Flow run ${linkData.leftEntityId} has more than one ${field === "flowDefinitionId" ? "Uses" : "Triggered By"} link in its web, to ${existingEntityUuid} and ${rightEntityUuid}`,
+        `Flow run ${linkData.leftEntityId} has more than one ${link.linkName} link in its web, to ${existingTarget} and ${link.target}`,
       );
     }
 
-    links[field] = rightEntityUuid;
+    if (link.field === "flowDefinitionEntityId") {
+      links.flowDefinitionEntityId = link.target;
+    } else {
+      links.flowTriggerId = link.target;
+    }
   }
 
   return linksByFlowRunEntityId;
diff --git a/libs/@local/hash-backend-utils/src/flows/shared/get-hash-web-id.ts b/libs/@local/hash-backend-utils/src/flows/shared/get-hash-web-id.ts
new file mode 100644
index 00000000000..ba2d6ba4ded
--- /dev/null
+++ b/libs/@local/hash-backend-utils/src/flows/shared/get-hash-web-id.ts
@@ -0,0 +1,21 @@
+import { extractWebIdFromEntityId } from "@blockprotocol/type-system";
+
+import { getHashInstance } from "../../hash-instance.js";
+
+import type { ActorEntityUuid, WebId } from "@blockprotocol/type-system";
+import type { GraphApi } from "@local/hash-graph-client";
+
+/**
+ * The id of the `h` web, which HASH's own flow definitions are seeded into: the web the `HASH Instance` entity is in.
+ */
+export const getHashWebId = async (
+  graphApiClient: GraphApi,
+  authentication: { actorId: ActorEntityUuid },
+): Promise<WebId> => {
+  const { entity } = await getHashInstance(
+    { graphApi: graphApiClient },
+    authentication,
+  );
+
+  return extractWebIdFromEntityId(entity.metadata.recordId.entityId);
+};
diff --git a/libs/@local/hash-isomorphic-utils/src/flows/flow-definition-ids.ts b/libs/@local/hash-isomorphic-utils/src/flows/flow-definition-ids.ts
index 6a12288f7db..4d381646931 100644
--- a/libs/@local/hash-isomorphic-utils/src/flows/flow-definition-ids.ts
+++ b/libs/@local/hash-isomorphic-utils/src/flows/flow-definition-ids.ts
@@ -1,7 +1,13 @@
-import type { EntityUuid } from "@blockprotocol/type-system";
+import {
+  entityIdFromComponents,
+  extractEntityUuidFromEntityId,
+} from "@blockprotocol/type-system";
+
+import type { EntityId, EntityUuid, WebId } from "@blockprotocol/type-system";
 
 /**
- * The ids of the flows defined in code, which are also the entity uuids of their `Flow Definition` entities.
+ * The ids of the flows defined in code, which are also the entity uuids of their `Flow Definition` entities in the
+ * `h` web.
  *
  * Code that starts a run of one of these flows, or recognises its runs, uses its id from here. The definitions are
  * in `definitions/`, which only seeding, the compiler and tests use: runs execute the definition stored in the
@@ -21,8 +27,28 @@ export const flowDefinitionIds = {
   ftseInvestors: "25f32cd2-6f6e-5641-92b7-d9a90e517e0f" as EntityUuid,
 } as const;
 
+/**
+ * The entity id of one of the flows defined in code. They're seeded into the `h` web, the web the instance's
+ * `HASH Instance` entity is in, whose id differs on every instance.
+ */
+export const generateHashFlowDefinitionEntityId = (
+  hashWebId: WebId,
+  flowDefinitionId: EntityUuid,
+): EntityId => entityIdFromComponents(hashWebId, flowDefinitionId);
+
+/**
+ * Whether a run or definition is of one of the flows defined in code. Entity uuids are unique across webs, so the
+ * uuid alone identifies it.
+ */
+export const isHashFlowDefinitionEntityId = (
+  flowDefinitionEntityId: EntityId,
+  flowDefinitionId: EntityUuid,
+) => extractEntityUuidFromEntityId(flowDefinitionEntityId) === flowDefinitionId;
+
 /**
  * Whether a run or definition is of the goal flow.
  */
-export const isGoalFlowDefinitionId = (flowDefinitionId: string) =>
-  flowDefinitionId === flowDefinitionIds.goal;
+export const isGoalFlowDefinitionEntityId = (
+  flowDefinitionEntityId: EntityId,
+) =>
+  isHashFlowDefinitionEntityId(flowDefinitionEntityId, flowDefinitionIds.goal);
diff --git a/libs/@local/hash-isomorphic-utils/src/flows/frontend-paths.ts b/libs/@local/hash-isomorphic-utils/src/flows/frontend-paths.ts
index 64c79d8db31..f0c7131a11c 100644
--- a/libs/@local/hash-isomorphic-utils/src/flows/frontend-paths.ts
+++ b/libs/@local/hash-isomorphic-utils/src/flows/frontend-paths.ts
@@ -3,13 +3,18 @@ import {
   type EntityId,
 } from "@blockprotocol/type-system";
 
+/**
+ * The page of a flow definition. The shortname names the definition's web, so the path only needs the uuid of its
+ * entity.
+ */
 export const generateFlowDefinitionPath = ({
   shortname,
-  flowDefinitionId,
+  flowDefinitionEntityId,
 }: {
   shortname: string;
-  flowDefinitionId: string;
-}) => `/@${shortname}/flows/${flowDefinitionId}`;
+  flowDefinitionEntityId: EntityId;
+}) =>
+  `/@${shortname.replace(/^@/, "")}/flows/${extractEntityUuidFromEntityId(flowDefinitionEntityId)}`;
 
 /**
  * The page of a flow run. The shortname names the run's web, so the path only needs the uuid of its entity.
@@ -26,8 +31,8 @@ export const generateWorkerRunPath = ({
 export const workerFlowFilterParam = "flow";
 
 export const generatedFilteredWorkersPath = ({
-  flowDefinitionIds,
+  flowDefinitionEntityIds,
 }: {
-  flowDefinitionIds: string[];
+  flowDefinitionEntityIds: EntityId[];
 }) =>
-  `/workers?${flowDefinitionIds.map((flowDefinitionId) => `${workerFlowFilterParam}=${flowDefinitionId}`).join("&")}`;
+  `/workers?${flowDefinitionEntityIds.map((flowDefinitionEntityId) => `${workerFlowFilterParam}=${encodeURIComponent(flowDefinitionEntityId)}`).join("&")}`;
diff --git a/libs/@local/hash-isomorphic-utils/src/flows/schedule-types.ts b/libs/@local/hash-isomorphic-utils/src/flows/schedule-types.ts
index 136c15eae5f..ab68cfd08aa 100644
--- a/libs/@local/hash-isomorphic-utils/src/flows/schedule-types.ts
+++ b/libs/@local/hash-isomorphic-utils/src/flows/schedule-types.ts
@@ -1,6 +1,6 @@
 import type { ScheduleOverlapPolicyDataType } from "../system-types/flowschedule.js";
 import type { FlowDataSources, FlowInputValues } from "./types.js";
-import type { EntityUuid, WebId } from "@blockprotocol/type-system";
+import type { EntityId, WebId } from "@blockprotocol/type-system";
 
 /**
  * Interval-based schedule specification.
@@ -39,8 +39,8 @@ export const defaultScheduleCatchupWindowMs = 60 * 60 * 1000;
 export type CreateFlowScheduleInput = {
   /** Human-readable name for this schedule */
   name: string;
-  /** The uuid of the `Flow Definition` entity the schedule starts runs of */
-  flowDefinitionId: EntityUuid;
+  /** The `Flow Definition` entity the schedule starts runs of */
+  flowDefinitionEntityId: EntityId;
   /** The web this schedule belongs to */
   webId: WebId;
   /** The scheduling specification */
diff --git a/libs/@local/hash-isomorphic-utils/src/flows/temporal-types.ts b/libs/@local/hash-isomorphic-utils/src/flows/temporal-types.ts
index a051ce7e801..e730c8e710a 100644
--- a/libs/@local/hash-isomorphic-utils/src/flows/temporal-types.ts
+++ b/libs/@local/hash-isomorphic-utils/src/flows/temporal-types.ts
@@ -23,10 +23,10 @@ export type BaseRunFlowWorkflowParams = {
    */
   flowRunEntityUuid?: EntityUuid;
   /**
-   * The uuid of the `Flow Definition` entity to run. The run loads the definition when it starts, so it runs the
-   * edition current at that time.
+   * The `Flow Definition` entity to run. The run loads the definition when it starts, so it runs the edition current
+   * at that time.
    */
-  flowDefinitionId: EntityUuid;
+  flowDefinitionEntityId: EntityId;
   /**
    * Optional name for the flow run. If not provided, the flow definition name is used.
    * For scheduled flows, this is typically the schedule name.
diff --git a/libs/@local/hash-isomorphic-utils/src/flows/types.ts b/libs/@local/hash-isomorphic-utils/src/flows/types.ts
index 1543463947d..1fb51115b7b 100644
--- a/libs/@local/hash-isomorphic-utils/src/flows/types.ts
+++ b/libs/@local/hash-isomorphic-utils/src/flows/types.ts
@@ -796,7 +796,7 @@ export type LocalFlowRun<
   name: string;
   temporalWorkflowId: string;
   flowInputs: FlowInputValues;
-  flowDefinitionId: EntityUuid;
+  flowDefinitionEntityId: EntityId;
   steps: FlowStep<ActionDefinitionId>[];
   outputs?: StepOutput[];
 };
diff --git a/libs/@local/hash-isomorphic-utils/src/graphql/queries/flow.queries.ts b/libs/@local/hash-isomorphic-utils/src/graphql/queries/flow.queries.ts
index 0808963c798..26ae948c42a 100644
--- a/libs/@local/hash-isomorphic-utils/src/graphql/queries/flow.queries.ts
+++ b/libs/@local/hash-isomorphic-utils/src/graphql/queries/flow.queries.ts
@@ -7,7 +7,7 @@ export const getFlowRunsQuery = gql`
       nextCursor
       flowRuns {
         name
-        flowDefinitionId
+        flowDefinitionEntityId
         flowRunEntityId
         flowScheduleId
         webId
@@ -37,7 +37,7 @@ export const getFlowRunById = gql`
   query getFlowRunById($flowRunEntityId: EntityId!) {
     getFlowRunById(flowRunEntityId: $flowRunEntityId) {
       name
-      flowDefinitionId
+      flowDefinitionEntityId
       flowRunEntityId
       flowScheduleId
       failureMessage
diff --git a/libs/@local/hash-isomorphic-utils/src/graphql/type-defs/knowledge/flow.typedef.ts b/libs/@local/hash-isomorphic-utils/src/graphql/type-defs/knowledge/flow.typedef.ts
index 1a713ae4c00..5249f66c7a2 100644
--- a/libs/@local/hash-isomorphic-utils/src/graphql/type-defs/knowledge/flow.typedef.ts
+++ b/libs/@local/hash-isomorphic-utils/src/graphql/type-defs/knowledge/flow.typedef.ts
@@ -134,9 +134,9 @@ export const flowTypedef = gql`
     """
     flowScheduleId: EntityUuid
     """
-    The id for the definition of the flow this run is executing (the template for the flow)
+    The entity id of the Flow Definition entity this run is executing.
     """
-    flowDefinitionId: String!
+    flowDefinitionEntityId: EntityId!
     """
     A user-facing name for the flow run to distinguish it from other runs of its kind,
     which might include a key input or a summary of its key inputs.
@@ -208,9 +208,9 @@ export const flowTypedef = gql`
   extend type Query {
     getFlowRuns(
       """
-      Return only flow runs that are based off specific definitions
+      Return only flow runs of these Flow Definition entities
       """
-      flowDefinitionIds: [String!]
+      flowDefinitionEntityIds: [EntityId!]
       """
       Return only flows that match the given status
       """
@@ -236,7 +236,7 @@ export const flowTypedef = gql`
     """
     startFlow(
       dataSources: FlowDataSources
-      flowDefinitionId: EntityUuid!
+      flowDefinitionEntityId: EntityId!
       flowInputs: FlowInputValues!
       webId: WebId!
     ): EntityId!