diff --git a/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp b/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp
index e524f5f..d46a2d6 100644
--- a/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp
+++ b/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp
@@ -32,6 +32,7 @@
 #include <nn/os/os_SharedInfo.h>
 #include <nn/pl/CTR/pl_Version.h>
 #include <nn/fs/fs_ApiSharedExtSaveData.h>
+#include <nn/nim.h>
 
 #include "demo.h"
 
@@ -240,6 +241,11 @@ extern "C" void nnMain(void)
     bit32 deviceId;
     result = nn::ps::CTR::GetDeviceId(&deviceId);
     COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    bit64 infraDeviceId;
+    result = nn::nim::CTR::InitializeForShop();
+    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    result = nn::nim::CTR::Shop::GetInfraDeviceId(deviceId, &infraDeviceId);
+    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
 
     // MACアドレスの取得
     nn::nwm::Mac mac;
@@ -266,7 +272,7 @@ extern "C" void nnMain(void)
             mVerData.nup.majorVersion);
     COMMON_LOGGER("System Region  %s\n", nn::cfg::CTR::GetRegionCodeA3(region));
     COMMON_LOGGER("Serial Number  %s\n", s_SerialNo);
-    COMMON_LOGGER("Device ID      %X\n", deviceId);
+    COMMON_LOGGER("Device ID      %llu\n", infraDeviceId);
     COMMON_LOGGER("MAC Address    %s\n", macAddress);
     COMMON_LOGGER("Friend Code    %04u-%04u-%04u\n",
             static_cast<u32>(friendCode / 100000000ULL % 10000ULL),
@@ -354,7 +360,7 @@ extern "C" void nnMain(void)
                 BACKUP_VERSION_NUM,
                 &mVerData,
                 batteryRemain,
-                deviceId,
+                infraDeviceId,
                 friendCode,
                 GetProgress(),
                 macAddress,
diff --git a/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.rsf b/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.rsf
index 08c3781..b9d1208 100644
--- a/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.rsf
+++ b/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.rsf
@@ -24,6 +24,7 @@ SystemControlInfo:
                 - hid
                 - gsp
                 - friends
+                - nim
 
 AccessControlInfo:
   Priority      : 16
diff --git a/trunk/ConsoleDataMigration/ConsoleBackup/OMakefile b/trunk/ConsoleDataMigration/ConsoleBackup/OMakefile
index 487f326..b152d3d 100644
--- a/trunk/ConsoleDataMigration/ConsoleBackup/OMakefile
+++ b/trunk/ConsoleDataMigration/ConsoleBackup/OMakefile
@@ -65,6 +65,7 @@ LIBS               +=   libnn_cfg \
                         lib_demo \
                         libnn_nwm \
                         libnn_friends \
+                        libnn_nim \
 
 INSTALL_SDK_TOOL = true
 
diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.cpp
index d98e116..ce7f020 100644
--- a/trunk/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.cpp
+++ b/trunk/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.cpp
@@ -32,6 +32,7 @@
 #include <nn/am/am_ApiSystemMenu.h>
 #include <nn/os/os_SharedInfo.h>
 #include <nn/ndm.h>
+#include <nn/nim.h>
 #include "demo.h"
 
 #include <vector>
@@ -264,6 +265,11 @@ extern "C" void nnMain(void)
     bit32 deviceId;
     result = nn::ps::CTR::GetDeviceId(&deviceId);
     COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    bit64 infraDeviceId;
+    result = nn::nim::CTR::InitializeForShop();
+    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+    result = nn::nim::CTR::Shop::GetInfraDeviceId(deviceId, &infraDeviceId);
+    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
 
     // MACアドレスの取得
     nn::nwm::Mac mac;
@@ -290,7 +296,7 @@ extern "C" void nnMain(void)
             mVerData.nup.majorVersion);
     COMMON_LOGGER("System Region  %s\n", nn::cfg::CTR::GetRegionCodeA3(region));
     COMMON_LOGGER("Serial Number  %s\n", s_SerialNo);
-    COMMON_LOGGER("Device ID      %X\n", deviceId);
+    COMMON_LOGGER("Device ID      %llu\n", infraDeviceId);
     COMMON_LOGGER("MAC Address    %s\n", macAddress);
     COMMON_LOGGER("Friend Code    %04u-%04u-%04u\n",
             static_cast<u32>(friendCode / 100000000ULL % 10000ULL),
@@ -387,7 +393,7 @@ extern "C" void nnMain(void)
                 RESTORE_VERSION_NUM,
                 &mVerData,
                 batteryRemain,
-                deviceId,
+                infraDeviceId,
                 friendCode,
                 GetProgress(),
                 macAddress,
diff --git a/trunk/ConsoleDataMigration/common/DrawSystemState.cpp b/trunk/ConsoleDataMigration/common/DrawSystemState.cpp
index df58acf..b0206a0 100644
--- a/trunk/ConsoleDataMigration/common/DrawSystemState.cpp
+++ b/trunk/ConsoleDataMigration/common/DrawSystemState.cpp
@@ -49,7 +49,7 @@ void DrawSystemState
         const char* toolVersion,
         common::VerDef* mVerData,
         u8 batteryRemain,
-        bit32 deviceId,
+        u64 deviceId,
         u64 friendCode,
         u32 progress,
         char8* macAddress,
@@ -84,7 +84,7 @@ void DrawSystemState
             mVerData->nup.majorVersion);
     renderSystem.DrawText(0, line++ * spaceSize, "System Region  %s", nn::cfg::CTR::GetRegionCodeA3(region));
     renderSystem.DrawText(0, line++ * spaceSize, "Serial No.     %s", s_SerialNo);
-    renderSystem.DrawText(0, line++ * spaceSize, "Device ID      %X", deviceId);
+    renderSystem.DrawText(0, line++ * spaceSize, "Device ID      %llu", deviceId);
     renderSystem.DrawText(0, line++ * spaceSize, "MAC Address    %s", macAddress);
     renderSystem.DrawText(0, line++ * spaceSize, "Friend Code    %04u-%04u-%04u", static_cast<u32> (friendCode
             / 100000000ULL % 10000ULL), static_cast<u32> (friendCode / 10000ULL % 10000ULL),
diff --git a/trunk/ConsoleDataMigration/common/DrawSystemState.h b/trunk/ConsoleDataMigration/common/DrawSystemState.h
index 785a8ff..b1240a2 100644
--- a/trunk/ConsoleDataMigration/common/DrawSystemState.h
+++ b/trunk/ConsoleDataMigration/common/DrawSystemState.h
@@ -55,7 +55,7 @@ void DrawSystemState
         const char* toolVersion,
         common::VerDef* mVerData,
         u8 batteryRemain,
-        bit32 deviceId,
+        u64 deviceId,
         u64 friendCode,
         u32 progress,
         char8* macAddress,