The iPhone 2

Assume that the iPhone is sim-locked to AT&T (or O2 in this country). When the iPhone 2 arrives, can I move my SIM into one and avoid another 18-month lock-in? Or are Apple going to move beyond mere provider-level locking on this one?