You should no longer file with your ITIN number once you are issued a Social Security number, as the IRS says here. (Note that this is the case regardless of the work-related circumstances surrounding the Social Security number.) It appears your employer is on top of this, using the new and correct number on the W-2.