diff --git a/packages/react-server/src/ReactDOMServerFormatConfig.js b/packages/react-dom/src/server/ReactDOMServerFormatConfig.js
similarity index 98%
rename from packages/react-server/src/ReactDOMServerFormatConfig.js
rename to packages/react-dom/src/server/ReactDOMServerFormatConfig.js
index 104834ca88ecd..b06196c452a60 100644
--- a/packages/react-server/src/ReactDOMServerFormatConfig.js
+++ b/packages/react-dom/src/server/ReactDOMServerFormatConfig.js
@@ -14,6 +14,7 @@ import {
   convertStringToBuffer,
 } from 'react-server/src/ReactServerStreamConfig';
 
+import escapeTextForBrowser from './escapeTextForBrowser';
 import invariant from 'shared/invariant';
 
 // Per response,
@@ -46,13 +47,11 @@ export function createSuspenseBoundaryID(
 }
 
 function encodeHTMLIDAttribute(value: string): string {
-  // TODO: This needs to be encoded for security purposes.
-  return value;
+  return escapeTextForBrowser(value);
 }
 
 function encodeHTMLTextNode(text: string): string {
-  // TOOD: This needs to be encoded for security purposes.
-  return text;
+  return escapeTextForBrowser(text);
 }
 
 export function pushTextInstance(
diff --git a/packages/react-server/src/ReactNativeServerFormatConfig.js b/packages/react-native-renderer/src/server/ReactNativeServerFormatConfig.js
similarity index 100%
rename from packages/react-server/src/ReactNativeServerFormatConfig.js
rename to packages/react-native-renderer/src/server/ReactNativeServerFormatConfig.js
diff --git a/packages/react-server/src/forks/ReactServerFormatConfig.dom-browser.js b/packages/react-server/src/forks/ReactServerFormatConfig.dom-browser.js
index e06662579e5a2..c6e482efeb60c 100644
--- a/packages/react-server/src/forks/ReactServerFormatConfig.dom-browser.js
+++ b/packages/react-server/src/forks/ReactServerFormatConfig.dom-browser.js
@@ -7,4 +7,4 @@
  * @flow
  */
 
-export * from '../ReactDOMServerFormatConfig';
+export * from 'react-dom/src/server/ReactDOMServerFormatConfig';
diff --git a/packages/react-server/src/forks/ReactServerFormatConfig.dom-relay.js b/packages/react-server/src/forks/ReactServerFormatConfig.dom-relay.js
index e06662579e5a2..c6e482efeb60c 100644
--- a/packages/react-server/src/forks/ReactServerFormatConfig.dom-relay.js
+++ b/packages/react-server/src/forks/ReactServerFormatConfig.dom-relay.js
@@ -7,4 +7,4 @@
  * @flow
  */
 
-export * from '../ReactDOMServerFormatConfig';
+export * from 'react-dom/src/server/ReactDOMServerFormatConfig';
diff --git a/packages/react-server/src/forks/ReactServerFormatConfig.dom.js b/packages/react-server/src/forks/ReactServerFormatConfig.dom.js
index e06662579e5a2..c6e482efeb60c 100644
--- a/packages/react-server/src/forks/ReactServerFormatConfig.dom.js
+++ b/packages/react-server/src/forks/ReactServerFormatConfig.dom.js
@@ -7,4 +7,4 @@
  * @flow
  */
 
-export * from '../ReactDOMServerFormatConfig';
+export * from 'react-dom/src/server/ReactDOMServerFormatConfig';
diff --git a/packages/react-server/src/forks/ReactServerFormatConfig.native-relay.js b/packages/react-server/src/forks/ReactServerFormatConfig.native-relay.js
index 2cfdaeeb37688..96c71b77141a2 100644
--- a/packages/react-server/src/forks/ReactServerFormatConfig.native-relay.js
+++ b/packages/react-server/src/forks/ReactServerFormatConfig.native-relay.js
@@ -7,4 +7,4 @@
  * @flow
  */
 
-export * from '../ReactNativeServerFormatConfig';
+export * from 'react-native-renderer/src/server/ReactNativeServerFormatConfig';