x86: use x2apic id reported by cpuid during topology discovery