diff --git a/data/schema.graphql b/data/schema.graphql
index cc50c0981b..91925e9567 100644
--- a/data/schema.graphql
+++ b/data/schema.graphql
@@ -264,7 +264,7 @@ type Artwork implements Node {
   manufacturer(format: Format): String
   series(format: Format): String
   meta: ArtworkMeta
-  layer(id: ID): ArtworkLayer
+  layer(id: String): ArtworkLayer
   layers: [ArtworkLayer]
 }
 
@@ -482,7 +482,7 @@ type ArtworkSearchEntity implements Node {
   manufacturer(format: Format): String
   series(format: Format): String
   meta: ArtworkMeta
-  layer(id: ID): ArtworkLayer
+  layer(id: String): ArtworkLayer
   layers: [ArtworkLayer]
 }
 
@@ -888,7 +888,7 @@ type HomePageModulesParams {
 
 type Image {
   __id: ID!
-  id: String!
+  id: String
   href: String
   title: String
   width: Int
diff --git a/data/schema.json b/data/schema.json
index 0a1e527d0e..bed8b08014 100644
--- a/data/schema.json
+++ b/data/schema.json
@@ -1967,13 +1967,9 @@
               "description": "A type-specific ID.",
               "args": [],
               "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
@@ -6125,7 +6121,7 @@
                   "description": null,
                   "type": {
                     "kind": "SCALAR",
-                    "name": "ID",
+                    "name": "String",
                     "ofType": null
                   },
                   "defaultValue": null
@@ -17691,7 +17687,7 @@
                   "description": null,
                   "type": {
                     "kind": "SCALAR",
-                    "name": "ID",
+                    "name": "String",
                     "ofType": null
                   },
                   "defaultValue": null
diff --git a/externals/metaphysics b/externals/metaphysics
index 1fc70ede9f..0030b46633 160000
--- a/externals/metaphysics
+++ b/externals/metaphysics
@@ -1 +1 @@
-Subproject commit 1fc70ede9f7a0051bf57ab1b394717d9df35dc82
+Subproject commit 0030b46633766101ad85c5f0c3496ecd14101122
diff --git a/package.json b/package.json
index 6f03af03c3..77f8df2bee 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "test": "env NODE_ENV=test NODE_PATH=./lib mocha --recursive ./test",
     "ci": "npm run-script lint && npm run-script flow && npm test",
     "sync-externals": "npm run-script sync-schema && npm run-script sync-colors",
-    "sync-schema": "cd externals/metaphysics && git fetch && git checkout origin/master && npm install && npm run dump-schema -- ../../data",
+    "sync-schema": "cd externals/metaphysics && git fetch && git checkout origin/master && npm install && npm run dump-schema -- ../../data && rm -rf node_modules",
     "sync-colors": "cd externals/elan && git fetch && git checkout origin/master && cp components/lib/variables/colors.json ../../data",
     "start-packager": "cd node_modules/react-native && npm start -- --reset-cache",
     "clean-example": "cd Example && xcodebuild -workspace Emission.xcworkspace -scheme Emission -destination 'platform=iOS Simulator,name=iPhone 6' clean",