Server check now uses server ID