diff --git a/src/app/Coriolis.jsx b/src/app/Coriolis.jsx
index 8b544b1f..79ec5838 100644
--- a/src/app/Coriolis.jsx
+++ b/src/app/Coriolis.jsx
@@ -113,9 +113,9 @@ export default class Coriolis extends React.Component {
 
   async _getAnnouncements() {
     try {
-      const announces = await request.get('https://orbis.zone/api/announcement')
-        .query({ showInCoriolis: true });
-      this.setState({ announcements: announces.body });
+      const announces = await request.get('https://api.orbis.zone/announcements')
+        .query({ coriolis: true });
+      this.setState({ announcements: announces });
     } catch (err) {
       console.error(err)
     }
diff --git a/src/app/components/Header.jsx b/src/app/components/Header.jsx
index 37456526..6c56e504 100644
--- a/src/app/components/Header.jsx
+++ b/src/app/components/Header.jsx
@@ -426,7 +426,10 @@ export default class Header extends TranslatedComponent {
     if (this.props.announcements) {
       announcements = [];
       for (let announce of this.props.announcements) {
-        announcements.push(<Announcement text={announce.message} />);
+        if (announce.expiry < Date.now()) {
+          continue;
+        }
+        announcements.push(<Announcement text={announce.text} />);
         announcements.push(<hr/>);
       }
     }
diff --git a/src/app/pages/OutfittingPage.jsx b/src/app/pages/OutfittingPage.jsx
index 94c786b3..3b709258 100644
--- a/src/app/pages/OutfittingPage.jsx
+++ b/src/app/pages/OutfittingPage.jsx
@@ -686,13 +686,12 @@ export default class OutfittingPage extends Page {
   _genOrbis() {
     const data = {};
     const ship = this.state.ship;
-    ship.coriolisId = ship.id;
-    data.coriolisShip = ship;
-    data.url = window.location.href;
     data.title = this.state.buildName || ship.id;
     data.description = this.state.buildName || ship.id;
-    data.ShipName = ship.id;
-    data.Ship = ship.id;
+    data.body = ship;
+    data.url = `https://coriolis.io${outfitURL(ship.id, ship.toString(), data.title)}`;
+    ship.type = ship.id;
+
     console.log(data);
     this.context.showModal(<ModalOrbis ship={data} />);
   }
diff --git a/src/app/utils/ShortenUrl.js b/src/app/utils/ShortenUrl.js
index 2846db50..1097f3d1 100644
--- a/src/app/utils/ShortenUrl.js
+++ b/src/app/utils/ShortenUrl.js
@@ -105,7 +105,7 @@ function orbisShorten(url, success, error) {
   }
 }
 
-const API_ORBIS = 'https://orbis.zone/api/builds/add';
+const API_ORBIS = 'https://api.orbis.zone/ships';
 /**
  * Upload to Orbis
  * @param  {object} ship        The URL to shorten